Merge changes I423fc81d,I4b986404 into sc-dev am: 4f721d3d6b (6da5f531) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/android/provider/settings/backup/GlobalSettings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -75,5 +75,6 @@ public class GlobalSettings {
		Settings.Global.USER_DISABLED_HDR_FORMATS,
		Settings.Global.ARE_USER_DISABLED_HDR_FORMATS_ALLOWED,
		Settings.Global.DEVICE_CONFIG_SYNC_DISABLED,
		Settings.Global.POWER_BUTTON_LONG_PRESS,
		};
		}

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -587,7 +587,6 @@ public class SettingsBackupTest {
		Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,
		Settings.Global.ENABLED_SUBSCRIPTION_FOR_SLOT,
		Settings.Global.MODEM_STACK_ENABLED_FOR_SLOT,
		Settings.Global.POWER_BUTTON_LONG_PRESS,
		Settings.Global.POWER_BUTTON_VERY_LONG_PRESS,
		Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, // Temporary for R beta
		Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER,

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -127,8 +127,10 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
		@Override
		public void onBiometricAuthenticated(int userId, BiometricSourceType biometricSourceType,
		boolean isStrongBiometric) {
		// Strong auth will force the bouncer regardless of a successful face auth
		if (biometricSourceType == BiometricSourceType.FACE
		&& mBypassController.canBypass()) {
		&& mBypassController.canBypass()
		&& !mKeyguardUpdateMonitor.userNeedsStrongAuth()) {
		mView.animateDisappear();
		}
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardClockPositionAlgorithm.java

+8 −38

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.content.res.Resources;
		import android.util.MathUtils;

		import com.android.keyguard.KeyguardStatusView;
		import com.android.keyguard.KeyguardUpdateMonitor;
		import com.android.systemui.R;
		import com.android.systemui.animation.Interpolators;
		import com.android.systemui.statusbar.policy.KeyguardUserSwitcherListView;
		@@ -153,8 +152,6 @@ public class KeyguardClockPositionAlgorithm {
		*/
		private int mUnlockedStackScrollerPadding;

		private int mLockScreenMode;

		private boolean mIsSplitShade;

		/**
		@@ -228,13 +225,6 @@ public class KeyguardClockPositionAlgorithm {
		}
		}

		/**
		* Update lock screen mode for testing different layouts
		*/
		public void onLockScreenModeChanged(int mode) {
		mLockScreenMode = mode;
		}

		public float getMinStackScrollerPadding() {
		return mBypassEnabled ? mUnlockedStackScrollerPadding
		: mMinTopMargin + mKeyguardStatusHeight + mClockNotificationsMargin;
		@@ -245,12 +235,8 @@ public class KeyguardClockPositionAlgorithm {
		}

		private int getExpandedPreferredClockY() {
		if (mLockScreenMode != KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL) {
		return mMinTopMargin + mUserSwitchHeight;
		}
		return (mHasCustomClock && (!mHasVisibleNotifs \|\| mBypassEnabled)) ? mClockPreferredY
		: getExpandedClockPosition();
		}

		/**
		* Vertically align the clock and the shade in the available space considering only
		@@ -278,29 +264,20 @@ public class KeyguardClockPositionAlgorithm {
		}

		private int getClockY(float panelExpansion, float darkAmount) {
		// Dark: Align the bottom edge of the clock at about half of the screen:
		float clockYDark = (mHasCustomClock ? mClockPreferredY : getMaxClockY())
		+ burnInPreventionOffsetY();
		clockYDark = MathUtils.max(0, clockYDark);

		float clockYRegular = getExpandedPreferredClockY();
		float clockYBouncer = -mKeyguardStatusHeight;

		// Move clock up while collapsing the shade
		float shadeExpansion = Interpolators.FAST_OUT_LINEAR_IN.getInterpolation(panelExpansion);
		float clockY = MathUtils.lerp(clockYBouncer, clockYRegular, shadeExpansion);
		clockYDark = MathUtils.lerp(clockYBouncer, clockYDark, shadeExpansion);

		darkAmount = mBypassEnabled && !mHasCustomClock ? 1.0f : darkAmount;

		if (mLockScreenMode != KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL) {
		// This will keep the clock at the top but out of the cutout area
		float shift = 0;
		if (clockY - mBurnInPreventionOffsetYLargeClock < mCutoutTopInset) {
		shift = mCutoutTopInset - (clockY - mBurnInPreventionOffsetYLargeClock);
		}
		clockYDark = clockY + burnInPreventionOffsetY() + shift;
		}
		float clockYDark = clockY + burnInPreventionOffsetY() + shift;

		return (int) (MathUtils.lerp(clockY, clockYDark, darkAmount) + mOverStretchAmount);
		}

		@@ -333,19 +310,12 @@ public class KeyguardClockPositionAlgorithm {
		}

		private float burnInPreventionOffsetY() {
		int offset = mBurnInPreventionOffsetY;
		if (mLockScreenMode != KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL) {
		offset = mBurnInPreventionOffsetYLargeClock;
		}
		int offset = mBurnInPreventionOffsetYLargeClock;

		return getBurnInOffset(offset * 2, false /* xAxis */) - offset;
		}

		private float burnInPreventionOffsetX() {
		if (mLockScreenMode == KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL) {
		return getBurnInOffset(mBurnInPreventionOffsetX * 2, true /* xAxis */)
		- mBurnInPreventionOffsetX;
		}
		return getBurnInOffset(mBurnInPreventionOffsetX, true /* xAxis */);
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -253,12 +253,6 @@ public class NotificationPanelViewController extends PanelViewController {
		mKeyguardUpdateCallback =
		new KeyguardUpdateMonitorCallback() {

		@Override
		public void onLockScreenModeChanged(int mode) {
		mLockScreenMode = mode;
		mClockPositionAlgorithm.onLockScreenModeChanged(mode);
		}

		@Override
		public void onBiometricAuthenticated(int userId,
		BiometricSourceType biometricSourceType,
		@@ -594,7 +588,6 @@ public class NotificationPanelViewController extends PanelViewController {
		private final Executor mUiExecutor;
		private final SecureSettings mSecureSettings;

		private int mLockScreenMode = KeyguardUpdateMonitor.LOCK_SCREEN_MODE_NORMAL;
		private KeyguardMediaController mKeyguardMediaController;

		private View.AccessibilityDelegate mAccessibilityDelegate = new View.AccessibilityDelegate() {
		@@ -1254,10 +1247,7 @@ public class NotificationPanelViewController extends PanelViewController {
		mNotificationStackScrollLayoutController.getIntrinsicContentHeight(),
		expandedFraction,
		totalHeight,
		mLockScreenMode == KeyguardUpdateMonitor.LOCK_SCREEN_MODE_LAYOUT_1
		? mKeyguardStatusViewController.getHeight()
		: (int) (mKeyguardStatusViewController.getHeight()
		- mShelfHeight / 2.0f - mDarkIconSize / 2.0f),
		mKeyguardStatusViewController.getHeight(),
		userIconHeight,
		clockPreferredY, userSwitcherPreferredY, hasCustomClock(),
		hasVisibleNotifications, darkamount, mOverStretchAmount,