Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed mIsReturning initialized too late.

Browse Source 
Change-Id: Ic77e44b0deaf67e118a0564205646891b4d1a07b
This commit is contained in:
George Mount
2014-05-21 15:07:04 -07:00
parent 5639828a62
commit 37a3a136ea
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ActivityTransitionCoordinator.java
View File

@@ -189,15 +189,17 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
final protected SharedElementListener mListener;
protected ResultReceiver mResultReceiver;
final private FixedEpicenterCallback mEpicenterCallback = new FixedEpicenterCallback();
final protected boolean mIsReturning;
public ActivityTransitionCoordinator(Window window,
ArrayList<String> allSharedElementNames,
ArrayList<String> accepted, ArrayList<String> localNames,
SharedElementListener listener) {
SharedElementListener listener, boolean isReturning) {
super(new Handler());
mWindow = window;
mListener = listener;
mAllSharedElementNames = allSharedElementNames;
mIsReturning = isReturning;
setSharedElements(accepted, localNames);
if (getViewsTransition() != null) {
getDecor().captureTransitioningViews(mTransitioningViews);

4
core/java/android/app/EnterTransitionCoordinator.java
View File

@@ -55,16 +55,14 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
private boolean mHasStopped;
private Handler mHandler;
private boolean mIsCanceled;
private boolean mIsReturning;
private ObjectAnimator mBackgroundAnimator;
public EnterTransitionCoordinator(Activity activity, ResultReceiver resultReceiver,
ArrayList<String> sharedElementNames,
ArrayList<String> acceptedNames, ArrayList<String> mappedNames) {
super(activity.getWindow(), sharedElementNames, acceptedNames, mappedNames,
getListener(activity, acceptedNames));
getListener(activity, acceptedNames), acceptedNames != null);
mActivity = activity;
mIsReturning = acceptedNames != null;
setResultReceiver(resultReceiver);
prepareEnter();
Bundle resultReceiverBundle = new Bundle();

6
core/java/android/app/ExitTransitionCoordinator.java
View File

@@ -58,16 +58,14 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
private Handler mHandler;
private boolean mIsReturning;
private ObjectAnimator mBackgroundAnimator;
private boolean mIsHidden;
public ExitTransitionCoordinator(Activity activity, ArrayList<String> names,
ArrayList<String> accepted, ArrayList<String> mapped, boolean isReturning) {
super(activity.getWindow(), names, accepted, mapped, getListener(activity, isReturning));
mIsReturning = isReturning;
super(activity.getWindow(), names, accepted, mapped, getListener(activity, isReturning),
isReturning);
mIsBackgroundReady = !isReturning;
mActivity = activity;
}