Merge "Prevent the dismiss icon from fading when multistack debugging is enabled." (74e60ac9) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -815,8 +815,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
		}

		// Start dozing
		if (!mConfig.multiStackEnabled) {
		mUIDozeTrigger.startDozing();
		}
		}

		/** Requests this task stacks to start it's enter-recents animation */
		public void startEnterRecentsAnimation(ViewAnimation.TaskViewEnterContext ctx) {
		@@ -1219,7 +1221,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
		RecentsTaskLoader.getInstance().loadTaskData(task);

		// If the doze trigger has already fired, then update the state for this task view
		if (mUIDozeTrigger.hasTriggered()) {
		if (mConfig.multiStackEnabled \|\| mUIDozeTrigger.hasTriggered()) {
		tv.setNoUserInteractionState();
		}