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

am 1353b0f5: am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev

Browse Source 
* commit '1353b0f5e6494e97e3d41853127bb0fec420792c':
  Fixing issue with empty Recents screen.
This commit is contained in:
Winson Chung
2015-08-06 22:17:04 +00:00
committed by Android Git Automerger
parent 81287d2464 1353b0f5e6
commit 8da267a2f7
1 changed files with 14 additions and 2 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

@@ -419,8 +419,10 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
updateRecentsTasks();
// If this is a new instance from a configuration change, then we have to manually trigger
// the enter animation state
if (mConfig.launchedHasConfigurationChanged) {
// the enter animation state, or if recents was relaunched by AM, without going through
// the normal mechanisms
boolean wasLaunchedByAm = !mConfig.launchedFromHome && !mConfig.launchedFromAppWithThumbnail;
if (mConfig.launchedHasConfigurationChanged || wasLaunchedByAm) {
onEnterAnimationTriggered();
}
@@ -454,6 +456,16 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
// Unregister any broadcast receivers for the task loader
loader.unregisterReceivers();
// Workaround for b/22542869, if the RecentsActivity is started again, but without going
// through SystemUI, we need to reset the config launch flags to ensure that we do not
// wait on the system to send a signal that was never queued.
mConfig.launchedFromHome = false;
mConfig.launchedFromSearchHome = false;
mConfig.launchedFromAppWithThumbnail = false;
mConfig.launchedToTaskId = -1;
mConfig.launchedWithAltTab = false;
mConfig.launchedHasConfigurationChanged = false;
}
@Override