Merge cherrypicks of ['googleplex-android-review.googlesource.com/26603167',... (7bb01c28) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/EmphasizedNotificationButton.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -171,7 +171,9 @@ public class EmphasizedNotificationButton extends Button {
		return;
		}

		if (icon != null) {
		prepareIcon(icon);
		}

		mIconToGlue = icon;
		mGluePending = true;

+2 −3

Original line number	Diff line number	Diff line
		@@ -1368,7 +1368,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		* Handles all changes to the PictureInPictureParams.
		*/
		protected void applyNewPictureInPictureParams(@NonNull PictureInPictureParams params) {
		if (mDeferredTaskInfo != null \|\| PipUtils.aspectRatioChanged(params.getAspectRatioFloat(),
		if (PipUtils.aspectRatioChanged(params.getAspectRatioFloat(),
		mPictureInPictureParams.getAspectRatioFloat())) {
		if (mPipBoundsAlgorithm.isValidPictureInPictureAspectRatio(
		params.getAspectRatioFloat())) {
		@@ -1381,8 +1381,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		TAG, params.hasSetAspectRatio(), params.getAspectRatioFloat());
		}
		}
		if (mDeferredTaskInfo != null
		\|\| PipUtils.remoteActionsChanged(params.getActions(),
		if (PipUtils.remoteActionsChanged(params.getActions(),
		mPictureInPictureParams.getActions())
		\|\| !PipUtils.remoteActionsMatch(params.getCloseAction(),
		mPictureInPictureParams.getCloseAction())) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -1914,6 +1914,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		accessibilityManager.performSystemAction(
		AccessibilityService.GLOBAL_ACTION_ACCESSIBILITY_ALL_APPS);
		}
		dismissKeyboardShortcutsMenu();
		}

		private void toggleNotificationPanel() {

+5 −0

Original line number	Diff line number	Diff line
		@@ -1258,6 +1258,11 @@ class RecentTasks {
		continue;
		}

		if (otherTask.topRunningActivity() == null) {
		// Skip if there's no running activity in the Task.
		continue;
		}

		// Stop searching if the task has higher z-ordering, or increase the index and
		// continue the search.
		if (task.compareTo(otherTask) > 0) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -1210,9 +1210,11 @@ public class RecentTasksTest extends WindowTestsBase {
		@Test
		public void addTask_tasksAreAddedAccordingToZOrder() {
		final Task firstTask = new TaskBuilder(mSupervisor).setTaskId(1)
		.setWindowingMode(WINDOWING_MODE_FREEFORM).build();
		.setWindowingMode(WINDOWING_MODE_FREEFORM)
		.setCreateActivity(true).build();
		final Task secondTask = new TaskBuilder(mSupervisor).setTaskId(2)
		.setWindowingMode(WINDOWING_MODE_FREEFORM).build();
		.setWindowingMode(WINDOWING_MODE_FREEFORM)
		.setCreateActivity(true).build();

		assertEquals(-1, firstTask.compareTo(secondTask));