disable exit transition until we have a fix for it

This commit is contained in:
Torsten Grote
2016-05-13 17:25:14 -03:00
parent 69026054cd
commit 6e545d0100
2 changed files with 11 additions and 6 deletions

View File

@@ -1,7 +1,6 @@
package org.briarproject.android.contact;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.FloatingActionButton;
@@ -51,6 +50,7 @@ import java.util.logging.Logger;
import javax.inject.Inject;
import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAnimation;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.BriarActivity.GROUP_ID;
@@ -122,10 +122,8 @@ public class ContactListFragment extends BaseFragment implements EventListener {
Pair.create((View) holder.bulb, ViewCompat
.getTransitionName(holder.bulb));
ActivityOptionsCompat options =
ActivityOptionsCompat
.makeSceneTransitionAnimation(
getActivity(), avatar,
bulb);
makeSceneTransitionAnimation(getActivity(),
avatar, bulb);
ActivityCompat.startActivity(getActivity(), i,
options.toBundle());
}

View File

@@ -212,7 +212,7 @@ public class ConversationActivity extends BriarActivity
// Handle presses on the action bar items
switch (item.getItemId()) {
case android.R.id.home:
supportFinishAfterTransition();
onBackPressed();
return true;
case R.id.action_introduction:
if (contactId == null) return false;
@@ -232,6 +232,13 @@ public class ConversationActivity extends BriarActivity
}
}
@Override
public void onBackPressed() {
// FIXME disabled exit transition, because it doesn't work for some reason
//supportFinishAfterTransition();
finish();
}
private void loadData() {
runOnDbThread(new Runnable() {
@Override