Snap for 7430067 from ad82033c4af5c9cae9565434a65e362e866b0a1d to sc-release (c4925caa) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android-non-updatable.api.public.latest",
		new_since: ":android.api.public.latest",
		},
		},
		dists: [
		@@ -109,7 +109,7 @@ droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android-non-updatable.api.system.latest",
		new_since: ":android.api.system.latest",
		baseline_file: "core/api/system-lint-baseline.txt",
		},
		},
		@@ -204,7 +204,7 @@ droidstubs {
		},
		api_lint: {
		enabled: true,
		new_since: ":android-non-updatable.api.module-lib.latest",
		new_since: ":android.api.module-lib.latest",
		},
		},
		dists: [

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -62,10 +62,9 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView

		@Override
		protected void setPasswordEntryEnabled(boolean enabled) {
		boolean wasEnabled = mPasswordEntry.isEnabled();
		mPasswordEntry.setEnabled(enabled);
		mOkButton.setEnabled(enabled);
		if (enabled && !wasEnabled && !mPasswordEntry.hasFocus()) {
		if (enabled && !mPasswordEntry.hasFocus()) {
		mPasswordEntry.requestFocus();
		}
		}

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsHbmProvider.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -31,8 +31,10 @@ public interface UdfpsHbmProvider {
		/**
		* UdfpsView will call this to enable the HBM when the fingerprint illumination is needed.
		*
		* The call must be made from the UI thread. The callback, if provided, will also be invoked
		* from the UI thread.
		* This method is a no-op when some type of HBM is already enabled.
		*
		* This method must be called from the UI thread. The callback, if provided, will also be
		* invoked from the UI thread.
		*
		* @param hbmType The type of HBM that should be enabled. See {@link UdfpsHbmTypes}.
		* @param surface The surface for which the HBM is requested, in case the HBM implementation
		@@ -45,14 +47,14 @@ public interface UdfpsHbmProvider {
		/**
		* UdfpsView will call this to disable the HBM when the illumination is not longer needed.
		*
		* This method is a no-op when HBM is already disabled. If HBM is enabled, this method will
		* disable HBM for the {@code hbmType} and {@code surface} that were provided to the
		* corresponding {@link #enableHbm(int, Surface, Runnable)}.
		*
		* The call must be made from the UI thread. The callback, if provided, will also be invoked
		* from the UI thread.
		*
		* @param hbmType The type of HBM that should be disabled. See {@link UdfpsHbmTypes}.
		* @param surface The surface for which the HBM is requested, in case the HBM implementation
		* needs to unset special surface flags to disable the HBM. Can be null.
		* @param onHbmDisabled A runnable that will be executed once HBM is disabled.
		*/
		void disableHbm(@HbmType int hbmType, @Nullable Surface surface,
		@Nullable Runnable onHbmDisabled);
		void disableHbm(@Nullable Runnable onHbmDisabled);
		}

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsSurfaceView.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,9 @@ public class UdfpsSurfaceView extends SurfaceView implements UdfpsIlluminator {
		@Override
		public void stopIllumination() {
		if (mHbmProvider != null) {
		final Runnable onHbmDisabled = this::invalidate;
		mHbmProvider.disableHbm(mHbmType, mHolder.getSurface(), onHbmDisabled);
		final Runnable onHbmDisabled =
		(mHbmType == UdfpsHbmTypes.GLOBAL_HBM) ? this::invalidate : null;
		mHbmProvider.disableHbm(onHbmDisabled);
		} else {
		Log.e(TAG, "stopIllumination \| mHbmProvider is null");
		}

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -372,6 +372,9 @@ public class NotificationShelf extends ActivatableNotificationView implements
		return;
		}

		final float smallCornerRadius =
		getResources().getDimension(R.dimen.notification_corner_radius_small)
		/ getResources().getDimension(R.dimen.notification_corner_radius);
		final float viewEnd = viewStart + anv.getActualHeight();
		final float cornerAnimationDistance = mCornerAnimationDistance
		* mAmbientState.getExpansionFraction();
		@@ -387,7 +390,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
		} else if (viewEnd < cornerAnimationTop) {
		// Fast scroll skips frames and leaves corners with unfinished rounding.
		// Reset top and bottom corners outside of animation bounds.
		anv.setBottomRoundness(anv.isLastInSection() ? 1f : 0f,
		anv.setBottomRoundness(anv.isLastInSection() ? 1f : smallCornerRadius,
		false /* animate */);
		}

		@@ -401,7 +404,7 @@ public class NotificationShelf extends ActivatableNotificationView implements
		} else if (viewStart < cornerAnimationTop) {
		// Fast scroll skips frames and leaves corners with unfinished rounding.
		// Reset top and bottom corners outside of animation bounds.
		anv.setTopRoundness(anv.isFirstInSection() ? 1f : 0f,
		anv.setTopRoundness(anv.isFirstInSection() ? 1f : smallCornerRadius,
		false /* animate */);
		}
		}