Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after... (7ce662ef) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -642,12 +642,13 @@ 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();

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -361,12 +361,11 @@ 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 SystemSericesProxy is initialized
		// For the non-primary user, ensure that the SystemServicesProxy and configuration is
		// initialized
		RecentsTaskLoader.initialize(this);

		// Initialize the loader and the configuration
		mConfig = RecentsConfiguration.reinitialize(this,
		RecentsTaskLoader.getInstance().getSystemServicesProxy());
		SystemServicesProxy ssp = RecentsTaskLoader.getInstance().getSystemServicesProxy();
		mConfig = RecentsConfiguration.reinitialize(this, ssp);

		// Initialize the widget host (the host id is static and does not change)
		mAppWidgetHost = new RecentsAppWidgetHost(this, Constants.Values.App.AppWidgetHostId);
		@@ -421,9 +420,6 @@ 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();
		@@ -450,6 +446,12 @@ 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

packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -252,6 +252,8 @@ 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);

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -542,7 +542,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
		loader.deleteTaskData(t, false);

		// Remove the old task from activity manager
		RecentsTaskLoader.getInstance().getSystemServicesProxy().removeTask(t.key.id);
		loader.getSystemServicesProxy().removeTask(t.key.id);
		}

		@Override