Merge "Cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION on LockIconViewController" into main (17ba8a4d) · Commits · e / os / android_frameworks_base

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

+5 −25

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset;
		import static com.android.systemui.flags.Flags.DOZING_MIGRATION_1;
		import static com.android.systemui.flags.Flags.LOCKSCREEN_WALLPAPER_DREAM_ENABLED;
		import static com.android.systemui.flags.Flags.NEW_AOD_TRANSITION;
		import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION;
		import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow;

		import android.annotation.SuppressLint;
		@@ -37,7 +36,6 @@ import android.graphics.Point;
		import android.graphics.Rect;
		import android.hardware.biometrics.BiometricAuthenticator;
		import android.hardware.biometrics.BiometricSourceType;
		import android.os.Process;
		import android.os.VibrationAttributes;
		import android.util.DisplayMetrics;
		import android.util.Log;
		@@ -793,33 +791,15 @@ public class LockIconViewController implements Dumpable {

		@VisibleForTesting
		void vibrateOnTouchExploration() {
		if (mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)) {
		mVibrator.performHapticFeedback(
		mView,
		HapticFeedbackConstants.CONTEXT_CLICK
		);
		} else {
		mVibrator.vibrate(
		Process.myUid(),
		mContext.getOpPackageName(),
		UdfpsController.EFFECT_CLICK,
		"lock-icon-down",
		TOUCH_VIBRATION_ATTRIBUTES);
		}
		}

		@VisibleForTesting
		void vibrateOnLongPress() {
		if (mFeatureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)) {
		mVibrator.performHapticFeedback(mView, UdfpsController.LONG_PRESS);
		} else {
		mVibrator.vibrate(
		Process.myUid(),
		mContext.getOpPackageName(),
		UdfpsController.EFFECT_CLICK,
		"lock-screen-lock-icon-longpress",
		TOUCH_VIBRATION_ATTRIBUTES);
		}
		}

		private final AuthController.Callback mAuthControllerCallback = new AuthController.Callback() {

packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerTest.java

+3 −43

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRIN

		import static com.android.keyguard.LockIconView.ICON_LOCK;
		import static com.android.keyguard.LockIconView.ICON_UNLOCK;
		import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION;

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.Mockito.anyBoolean;
		@@ -354,25 +353,7 @@ public class LockIconViewControllerTest extends LockIconViewControllerBaseTest {
		}

		@Test
		public void playHaptic_onTouchExploration_NoOneWayHaptics_usesVibrate() {
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false);

		// WHEN request to vibrate on touch exploration
		mUnderTest.vibrateOnTouchExploration();

		// THEN vibrates
		verify(mVibrator).vibrate(
		anyInt(),
		any(),
		eq(UdfpsController.EFFECT_CLICK),
		eq("lock-icon-down"),
		any());
		}

		@Test
		public void playHaptic_onTouchExploration_withOneWayHaptics_performHapticFeedback() {
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true);

		public void playHaptic_onTouchExploration_performHapticFeedback() {
		// WHEN request to vibrate on touch exploration
		mUnderTest.vibrateOnTouchExploration();

		@@ -381,25 +362,7 @@ public class LockIconViewControllerTest extends LockIconViewControllerBaseTest {
		}

		@Test
		public void playHaptic_onLongPress_NoOneWayHaptics_usesVibrate() {
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false);

		// WHEN request to vibrate on long press
		mUnderTest.vibrateOnLongPress();

		// THEN uses vibrate
		verify(mVibrator).vibrate(
		anyInt(),
		any(),
		eq(UdfpsController.EFFECT_CLICK),
		eq("lock-screen-lock-icon-longpress"),
		any());
		}

		@Test
		public void playHaptic_onLongPress_withOneWayHaptics_performHapticFeedback() {
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true);

		public void playHaptic_onLongPress_performHapticFeedback() {
		// WHEN request to vibrate on long press
		mUnderTest.vibrateOnLongPress();

		@@ -411,7 +374,6 @@ public class LockIconViewControllerTest extends LockIconViewControllerBaseTest {
		public void longPress_showBouncer_sceneContainerNotEnabled() {
		init(/* useMigrationFlag= */ false);
		mSceneTestUtils.getSceneContainerFlags().setEnabled(false);
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true);
		when(mFalsingManager.isFalseLongTap(anyInt())).thenReturn(false);

		// WHEN longPress
		@@ -426,7 +388,6 @@ public class LockIconViewControllerTest extends LockIconViewControllerBaseTest {
		public void longPress_showBouncer() {
		init(/* useMigrationFlag= */ false);
		mSceneTestUtils.getSceneContainerFlags().setEnabled(true);
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true);
		when(mFalsingManager.isFalseLongTap(anyInt())).thenReturn(false);

		// WHEN longPress
		@@ -441,7 +402,6 @@ public class LockIconViewControllerTest extends LockIconViewControllerBaseTest {
		public void longPress_falsingTriggered_doesNotShowBouncer() {
		init(/* useMigrationFlag= */ false);
		mSceneTestUtils.getSceneContainerFlags().setEnabled(true);
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true);
		when(mFalsingManager.isFalseLongTap(anyInt())).thenReturn(true);

		// WHEN longPress