Merge "Final cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION" into main (8aba2344) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -703,12 +703,6 @@ object Flags {
		@JvmField
		val USE_REPOS_FOR_BOUNCER_SHOWING = releasedFlag("use_repos_for_bouncer_showing")

		// 3100 - Haptic interactions

		// TODO(b/290213663): Tracking Bug
		@JvmField
		val ONE_WAY_HAPTICS_API_MIGRATION = releasedFlag("oneway_haptics_api_migration")

		/** TODO(b/296223317): Enables the new keyguard presentation containing a clock. */
		@JvmField
		val ENABLE_CLOCK_KEYGUARD_PRESENTATION = releasedFlag("enable_clock_keyguard_presentation")

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.keyguard.domain.interactor.BiometricUnlockInteractor;
		@@ -186,8 +185,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		private long mLastFpFailureUptimeMillis;
		private int mNumConsecutiveFpFailures;

		private final FeatureFlags mFeatureFlags;

		private static final class PendingAuthenticated {
		public final int userId;
		public final BiometricSourceType biometricSourceType;
		@@ -291,7 +288,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		ScreenOffAnimationController screenOffAnimationController,
		VibratorHelper vibrator,
		SystemClock systemClock,
		FeatureFlags featureFlags,
		DeviceEntryHapticsInteractor hapticsInteractor,
		Lazy<SelectedUserInteractor> selectedUserInteractor,
		BiometricUnlockInteractor biometricUnlockInteractor
		@@ -322,7 +318,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
		mVibratorHelper = vibrator;
		mLogger = biometricUnlockLogger;
		mSystemClock = systemClock;
		mFeatureFlags = featureFlags;
		mOrderUnlockAndWake = resources.getBoolean(
		com.android.internal.R.bool.config_orderUnlockAndWake);
		mHapticsInteractor = hapticsInteractor;

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.kt

+0 −5

Original line number	Diff line number	Diff line
		@@ -50,8 +50,6 @@ import com.android.systemui.biometrics.domain.interactor.PromptSelectorInteracto
		import com.android.systemui.biometrics.ui.viewmodel.CredentialViewModel
		import com.android.systemui.biometrics.ui.viewmodel.PromptViewModel
		import com.android.systemui.display.data.repository.FakeDisplayRepository
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.WakefulnessLifecycle
		import com.android.systemui.statusbar.VibratorHelper
		import com.android.systemui.statusbar.events.ANIMATING_OUT
		@@ -87,8 +85,6 @@ open class AuthContainerViewTest : SysuiTestCase() {
		@JvmField @Rule
		var mockitoRule = MockitoJUnit.rule()

		private val featureFlags = FakeFeatureFlags()

		@Mock
		lateinit var callback: AuthDialogCallback
		@Mock
		@@ -135,7 +131,6 @@ open class AuthContainerViewTest : SysuiTestCase() {
		@Before
		fun setup() {
		displayRepository = FakeDisplayRepository()
		featureFlags.set(Flags.ONE_WAY_HAPTICS_API_MIGRATION, false)

		displayStateInteractor =
		DisplayStateInteractorImpl(

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/BiometricsUnlockControllerTest.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.statusbar.phone;

		import static com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION;
		import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK;

		import static com.google.common.truth.Truth.assertThat;
		@@ -50,7 +49,6 @@ import com.android.systemui.SysuiTestCase;
		import com.android.systemui.biometrics.AuthController;
		import com.android.systemui.deviceentry.domain.interactor.DeviceEntryHapticsInteractor;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.FakeFeatureFlags;
		import com.android.systemui.keyguard.KeyguardViewMediator;
		import com.android.systemui.keyguard.WakefulnessLifecycle;
		import com.android.systemui.keyguard.domain.interactor.BiometricUnlockInteractor;
		@@ -130,14 +128,11 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
		@Mock
		private BiometricUnlockInteractor mBiometricUnlockInteractor;
		private final FakeSystemClock mSystemClock = new FakeSystemClock();
		private FakeFeatureFlags mFeatureFlags;
		private BiometricUnlockController mBiometricUnlockController;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mFeatureFlags = new FakeFeatureFlags();
		mFeatureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false);
		when(mKeyguardStateController.isShowing()).thenReturn(true);
		when(mUpdateMonitor.isDeviceInteractive()).thenReturn(true);
		when(mKeyguardStateController.isFaceEnrolled()).thenReturn(true);
		@@ -165,7 +160,6 @@ public class BiometricsUnlockControllerTest extends SysuiTestCase {
		mAuthController, mStatusBarStateController,
		mSessionTracker, mLatencyTracker, mScreenOffAnimationController, mVibratorHelper,
		mSystemClock,
		mFeatureFlags,
		mDeviceEntryHapticsInteractor,
		() -> mSelectedUserInteractor,
		mBiometricUnlockInteractor