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

Merge "Don't include front most excluded task in Multi-Window mode"

Browse Source 
am: a8c2c229d7

Change-Id: If5c1a8de2cc951d8ec97b40c57cbbc8313137a37
This commit is contained in:
Yoshinori Hirano
2016-12-08 21:05:16 +00:00
committed by android-build-merger
parent 0a7f2d076d a8c2c229d7
commit 435db7e690
1 changed files with 9 additions and 7 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

@@ -392,7 +392,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
RecentsActivityLaunchState launchState = config.getLaunchState(); RecentsActivityLaunchState launchState = config.getLaunchState();
if (!loadPlan.hasTasks()) { if (!loadPlan.hasTasks()) {
loader.preloadTasks(loadPlan, launchState.launchedToTaskId, loader.preloadTasks(loadPlan, launchState.launchedToTaskId,
!launchState.launchedFromHome); !launchState.launchedFromHome && !launchState.launchedViaDockGesture);
} }
RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options(); RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options();
@@ -519,12 +519,14 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD
EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, false)); EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, false));
MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY); MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY);
// Workaround for b/22542869, if the RecentsActivity is started again, but without going if (!isChangingConfigurations()) {
// through SystemUI, we need to reset the config launch flags to ensure that we do not // Workaround for b/22542869, if the RecentsActivity is started again, but without going
// wait on the system to send a signal that was never queued. // through SystemUI, we need to reset the config launch flags to ensure that we do not
RecentsConfiguration config = Recents.getConfiguration(); // wait on the system to send a signal that was never queued.
RecentsActivityLaunchState launchState = config.getLaunchState(); RecentsConfiguration config = Recents.getConfiguration();
launchState.reset(); RecentsActivityLaunchState launchState = config.getLaunchState();
launchState.reset();
}
} }
@Override @Override