diff options
Diffstat (limited to 'packages/SystemUI/src')
4 files changed, 12 insertions, 17 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index 4ce2c2b..10618e0 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -642,13 +642,12 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta /** Starts the recents activity */ void startRecentsActivity(ActivityManager.RunningTaskInfo topTask, boolean isTopTaskHome) { - RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); - RecentsConfiguration.reinitialize(mContext, mSystemServicesProxy); - if (sInstanceLoadPlan == null) { // Create a new load plan if onPreloadRecents() was never triggered + RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); sInstanceLoadPlan = loader.createLoadPlan(mContext); } + RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); loader.preloadTasks(sInstanceLoadPlan, isTopTaskHome); TaskStack stack = sInstanceLoadPlan.getTaskStack(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index 0f535db..ee631f5 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -361,11 +361,12 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // For the non-primary user, ensure that the SystemServicesProxy and configuration is - // initialized + // For the non-primary user, ensure that the SystemSericesProxy is initialized RecentsTaskLoader.initialize(this); - SystemServicesProxy ssp = RecentsTaskLoader.getInstance().getSystemServicesProxy(); - mConfig = RecentsConfiguration.reinitialize(this, ssp); + + // Initialize the loader and the configuration + mConfig = RecentsConfiguration.reinitialize(this, + RecentsTaskLoader.getInstance().getSystemServicesProxy()); // Initialize the widget host (the host id is static and does not change) mAppWidgetHost = new RecentsAppWidgetHost(this, Constants.Values.App.AppWidgetHostId); @@ -420,6 +421,9 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView super.onNewIntent(intent); setIntent(intent); + // Reinitialize the configuration + RecentsConfiguration.reinitialize(this, RecentsTaskLoader.getInstance().getSystemServicesProxy()); + // Clear any debug rects if (mDebugOverlay != null) { mDebugOverlay.clear(); @@ -446,12 +450,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView // Update the recent tasks updateRecentsTasks(getIntent()); - - // If this is a new instance from a configuration change, then we have to manually trigger - // the enter animation state - if (mConfig.launchedHasConfigurationChanged) { - onEnterAnimationTriggered(); - } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java index 81f0cef..255d642 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java @@ -252,8 +252,6 @@ public class TaskStack { if (group.getTaskCount() == 0) { removeGroup(group); } - // Update the lock-to-app state - t.lockToThisTask = false; if (mCb != null) { // Notify that a task has been removed mCb.onStackTaskRemoved(this, t, null); @@ -482,4 +480,4 @@ public class TaskStack { } return str; } -} +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index 427ffe5..ee79242 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -542,7 +542,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV loader.deleteTaskData(t, false); // Remove the old task from activity manager - loader.getSystemServicesProxy().removeTask(t.key.id); + RecentsTaskLoader.getInstance().getSystemServicesProxy().removeTask(t.key.id); } @Override |