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

core/java/android/window/TransitionInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public final class TransitionInfo implements Parcelable {
		FLAG_SYNC,
		FLAG_CONFIG_AT_END,
		FLAG_FIRST_CUSTOM
		})
		}, flag = true)
		public @interface ChangeFlags {}

		private final @TransitionType int mType;

core/res/res/values/strings.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -6499,17 +6499,17 @@ ul.</string>
		<!-- Fingerprint dangling notification title -->
		<string name="fingerprint_dangling_notification_title">Set up Fingerprint Unlock again</string>
		<!-- Fingerprint dangling notification content for only 1 fingerprint deleted -->
		<string name="fingerprint_dangling_notification_msg_1"><xliff:g id="fingerprint">%s</xliff:g> wasn\'t working well and was deleted</string>
		<string name="fingerprint_dangling_notification_msg_1"><xliff:g id="fingerprint">%s</xliff:g> can no longer be recognized.</string>
		<!-- Fingerprint dangling notification content for more than 1 fingerprints deleted -->
		<string name="fingerprint_dangling_notification_msg_2"><xliff:g id="fingerprint">%1$s</xliff:g> and <xliff:g id="fingerprint">%2$s</xliff:g> weren\'t working well and were deleted</string>
		<string name="fingerprint_dangling_notification_msg_2"><xliff:g id="fingerprint">%1$s</xliff:g> and <xliff:g id="fingerprint">%2$s</xliff:g> can no longer be recognized.</string>
		<!-- Fingerprint dangling notification content for only 1 fingerprint deleted and no fingerprint left-->
		<string name="fingerprint_dangling_notification_msg_all_deleted_1"><xliff:g id="fingerprint">%s</xliff:g> wasn\'t working well and was deleted. Set it up again to unlock your phone with fingerprint.</string>
		<string name="fingerprint_dangling_notification_msg_all_deleted_1"><xliff:g id="fingerprint">%s</xliff:g> can no longer be recognized. Set up Fingerprint Unlock again.</string>
		<!-- Fingerprint dangling notification content for more than 1 fingerprints deleted and no fingerprint left -->
		<string name="fingerprint_dangling_notification_msg_all_deleted_2"><xliff:g id="fingerprint">%1$s</xliff:g> and <xliff:g id="fingerprint">%2$s</xliff:g> weren\'t working well and were deleted. Set them up again to unlock your phone with your fingerprint.</string>
		<string name="fingerprint_dangling_notification_msg_all_deleted_2"><xliff:g id="fingerprint">%1$s</xliff:g> and <xliff:g id="fingerprint">%2$s</xliff:g> can no longer be recognized. Set up Fingerprint Unlock again.</string>
		<!-- Face dangling notification title -->
		<string name="face_dangling_notification_title">Set up Face Unlock again</string>
		<!-- Face dangling notification content -->
		<string name="face_dangling_notification_msg">Your face model wasn\'t working well and was deleted. Set it up again to unlock your phone with face.</string>
		<string name="face_dangling_notification_msg">Your face model can no longer be recognized. Set up Face Unlock again.</string>
		<!-- Biometric dangling notification "set up" action button -->
		<string name="biometric_dangling_notification_action_set_up">Set up</string>
		<!-- Biometric dangling notification "Not now" action button -->

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import static android.view.WindowManager.TRANSIT_TO_BACK;
		import static android.view.WindowManager.TRANSIT_TO_FRONT;
		import static android.view.WindowManager.fixScale;
		import static android.window.TransitionInfo.FLAG_BACK_GESTURE_ANIMATED;
		import static android.window.TransitionInfo.FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY;
		import static android.window.TransitionInfo.FLAG_IS_BEHIND_STARTING_WINDOW;
		import static android.window.TransitionInfo.FLAG_IS_OCCLUDED;
		import static android.window.TransitionInfo.FLAG_NO_ANIMATION;
		@@ -788,14 +789,16 @@ public class Transitions implements RemoteCallable<Transitions>,
		final int changeSize = info.getChanges().size();
		boolean taskChange = false;
		boolean transferStartingWindow = false;
		int noAnimationBehindStartingWindow = 0;
		int animBehindStartingWindow = 0;
		boolean allOccluded = changeSize > 0;
		for (int i = changeSize - 1; i >= 0; --i) {
		final TransitionInfo.Change change = info.getChanges().get(i);
		taskChange \|= change.getTaskInfo() != null;
		transferStartingWindow \|= change.hasFlags(FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT);
		if (change.hasAllFlags(FLAG_IS_BEHIND_STARTING_WINDOW \| FLAG_NO_ANIMATION)) {
		noAnimationBehindStartingWindow++;
		if (change.hasAllFlags(FLAG_IS_BEHIND_STARTING_WINDOW \| FLAG_NO_ANIMATION)
		\|\| change.hasAllFlags(
		FLAG_IS_BEHIND_STARTING_WINDOW \| FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY)) {
		animBehindStartingWindow++;
		}
		if (!change.hasFlags(FLAG_IS_OCCLUDED)) {
		allOccluded = false;
		@@ -813,11 +816,11 @@ public class Transitions implements RemoteCallable<Transitions>,
		// There does not need animation when:
		// A. Transfer starting window. Apply transfer starting window directly if there is no other
		// task change. Since this is an activity->activity situation, we can detect it by selecting
		// transitions with only 2 changes where
		// 1. neither are tasks, and
		// transitions with changes where
		// 1. none are tasks, and
		// 2. one is a starting-window recipient, or all change is behind starting window.
		if (!taskChange && (transferStartingWindow \|\| noAnimationBehindStartingWindow == changeSize)
		&& changeSize == 2
		if (!taskChange && (transferStartingWindow \|\| animBehindStartingWindow == changeSize)
		&& changeSize >= 1
		// B. It's visibility change if the TRANSIT_TO_BACK/TO_FRONT happened when all
		// changes are underneath another change.
		\|\| ((info.getType() == TRANSIT_TO_BACK \|\| info.getType() == TRANSIT_TO_FRONT)