Snap for 9839085 from 1dc4031b05c74cac9e147971a1e299dba8f1b346 to tm-qpr3-release (87dddf5e) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+12 −15

Original line number	Diff line number	Diff line
		@@ -1178,20 +1178,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,

		final Rect newDestinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
		if (newDestinationBounds.equals(currentDestinationBounds)) return;
		if (animator.getAnimationType() == ANIM_TYPE_BOUNDS) {
		if (mWaitForFixedRotation) {
		// The new destination bounds are in next rotation (DisplayLayout has been rotated
		// in computeRotatedBounds). The animation runs in previous rotation so the end
		// bounds need to be transformed.
		final Rect displayBounds = mPipBoundsState.getDisplayBounds();
		final Rect rotatedEndBounds = new Rect(newDestinationBounds);
		rotateBounds(rotatedEndBounds, displayBounds, mNextRotation, mCurrentRotation);
		animator.updateEndValue(rotatedEndBounds);
		} else {
		animator.updateEndValue(newDestinationBounds);
		}
		}
		animator.setDestinationBounds(newDestinationBounds);
		updateAnimatorBounds(newDestinationBounds);
		destinationBoundsOut.set(newDestinationBounds);
		}

		@@ -1203,8 +1190,18 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		mPipAnimationController.getCurrentAnimator();
		if (animator != null && animator.isRunning()) {
		if (animator.getAnimationType() == ANIM_TYPE_BOUNDS) {
		if (mWaitForFixedRotation) {
		// The new destination bounds are in next rotation (DisplayLayout has been
		// rotated in computeRotatedBounds). The animation runs in previous rotation so
		// the end bounds need to be transformed.
		final Rect displayBounds = mPipBoundsState.getDisplayBounds();
		final Rect rotatedEndBounds = new Rect(bounds);
		rotateBounds(rotatedEndBounds, displayBounds, mNextRotation, mCurrentRotation);
		animator.updateEndValue(rotatedEndBounds);
		} else {
		animator.updateEndValue(bounds);
		}
		}
		animator.setDestinationBounds(bounds);
		}
		}

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -64,7 +64,8 @@
		android:layout_height="@dimen/keyguard_affordance_fixed_height"
		android:layout_width="@dimen/keyguard_affordance_fixed_width"
		android:layout_gravity="bottom\|start"
		android:scaleType="center"
		android:scaleType="fitCenter"
		android:padding="@dimen/keyguard_affordance_fixed_padding"
		android:tint="?android:attr/textColorPrimary"
		android:background="@drawable/keyguard_bottom_affordance_bg"
		android:foreground="@drawable/keyguard_bottom_affordance_selected_border"
		@@ -77,7 +78,8 @@
		android:layout_height="@dimen/keyguard_affordance_fixed_height"
		android:layout_width="@dimen/keyguard_affordance_fixed_width"
		android:layout_gravity="bottom\|end"
		android:scaleType="center"
		android:scaleType="fitCenter"
		android:padding="@dimen/keyguard_affordance_fixed_padding"
		android:tint="?android:attr/textColorPrimary"
		android:background="@drawable/keyguard_bottom_affordance_bg"
		android:foreground="@drawable/keyguard_bottom_affordance_selected_border"

packages/SystemUI/res/values/dimens.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -800,6 +800,7 @@
		<dimen name="keyguard_affordance_fixed_height">48dp</dimen>
		<dimen name="keyguard_affordance_fixed_width">48dp</dimen>
		<dimen name="keyguard_affordance_fixed_radius">24dp</dimen>
		<dimen name="keyguard_affordance_fixed_padding">12dp</dimen>

		<!-- Amount the button should shake when it's not long-pressed for long enough. -->
		<dimen name="keyguard_affordance_shake_amplitude">8dp</dimen>

packages/SystemUI/src/com/android/keyguard/KeyguardPasswordViewController.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.text.method.TextKeyListener;
		import android.view.KeyEvent;
		import android.view.View;
		import android.view.ViewGroup.MarginLayoutParams;
		import android.view.WindowInsets;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputMethodInfo;
		import android.view.inputmethod.InputMethodManager;
		@@ -157,15 +156,6 @@ public class KeyguardPasswordViewController
		// TODO: Remove this workaround by ensuring such a race condition never happens.
		mMainExecutor.executeDelayed(
		this::updateSwitchImeButton, DELAY_MILLIS_TO_REEVALUATE_IME_SWITCH_ICON);
		mView.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
		@Override
		public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
		if (!mKeyguardViewController.isBouncerShowing()) {
		mView.hideKeyboard();
		}
		return insets;
		}
		});
		}

		@Override

packages/SystemUI/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProvider.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,12 @@ public interface NotificationInterruptStateProvider {
		* FSI even while the device was unlocked.
		*/
		NO_FSI_SUPPRESSIVE_GROUP_ALERT_BEHAVIOR(false),
		/**
		* Notification should not FSI due to having suppressive BubbleMetadata. This blocks a
		* potentially malicious use of flags that previously allowed apps to escalate a HUN to an
		* FSI even while the device was unlocked.
		*/
		NO_FSI_SUPPRESSIVE_BUBBLE_METADATA(false),
		/**
		* Device screen is off, so the FSI should launch.
		*/