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

Merge "Fixes recents from disappearing when split and restarted" into oc-mr1-dev

Browse Source 
am: f49f8f6f24

Change-Id: I1bfdf0635aadc0537eea400287043713a6aeffcf
This commit is contained in:
Matthew Ng
2017-08-09 21:09:35 +00:00
committed by android-build-merger
parent 23c57f3e7f f49f8f6f24
commit a659bb958e
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
View File

@@ -404,6 +404,17 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
// Notify of the next draw
mRecentsView.getViewTreeObserver().addOnPreDrawListener(mRecentsDrawnEventListener);
// If Recents was restarted, then it should complete the enter animation with partially
// reset launch state with dock, app and home set to false
Object isRelaunching = getLastNonConfigurationInstance();
if (isRelaunching != null && isRelaunching instanceof Boolean && (boolean) isRelaunching) {
RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState();
launchState.launchedViaDockGesture = false;
launchState.launchedFromApp = false;
launchState.launchedFromHome = false;
onEnterAnimationComplete();
}
}
@Override
@@ -508,6 +519,11 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());
}
@Override
public Object onRetainNonConfigurationInstance() {
return true;
}
@Override
protected void onPause() {
super.onPause();