Merge "Move onStart update of recents tasks to onResume" into nyc-dev (81505b48) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java

+16 −18

Original line number	Diff line number	Diff line
		@@ -337,7 +337,23 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
		@Override
		protected void onStart() {
		super.onStart();
		updatePipUI();
		}

		@Override
		public void onEnterAnimationComplete() {
		super.onEnterAnimationComplete();
		if(mLaunchedFromHome) {
		mHomeRecentsEnterExitAnimationHolder.startEnterAnimation(mPipManager.isPipShown());
		}
		mTaskStackViewAdapter.setResetAddedCards(true);
		EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());
		}

		@Override
		public void onResume() {
		super.onResume();
		mPipRecentsOverlayManager.onRecentsResumed();
		// Update the recent tasks
		updateRecentsTasks();

		@@ -368,24 +384,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
		// Notify that recents is now visible
		SystemServicesProxy ssp = Recents.getSystemServices();
		EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, true));

		updatePipUI();
		}

		@Override
		public void onEnterAnimationComplete() {
		super.onEnterAnimationComplete();
		if(mLaunchedFromHome) {
		mHomeRecentsEnterExitAnimationHolder.startEnterAnimation(mPipManager.isPipShown());
		}
		mTaskStackViewAdapter.setResetAddedCards(true);
		EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent());
		}

		@Override
		public void onResume() {
		super.onResume();
		mPipRecentsOverlayManager.onRecentsResumed();
		if(mTaskStackHorizontalGridView.getStack().getTaskCount() > 1 && !mLaunchedFromHome) {
		// If there are 2 or more tasks, and we are not launching from home
		// set the selected position to the 2nd task to allow for faster app switching