Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86a377dc authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Android (Google) Code Review
Browse files

Merge "Move vibrate while unlocked behind a flag" into main

parents fe770d38 fe331f1f

src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleController.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class PoliteNotifVibrateUnlockedToggleController extends TogglePreference 
    @Override

    public int getAvailabilityStatus() {

        // TODO: b/291897570 - remove this when the feature flag is removed!

        if (!Flags.politeNotifications()) {

        if (!Flags.politeNotifications() || !Flags.vibrateWhileUnlocked()) {

            return CONDITIONALLY_UNAVAILABLE;

        }

        return mContext.getSystemService(Vibrator.class).hasVibrator() ? AVAILABLE

tests/robotests/src/com/android/settings/notification/PoliteNotifVibrateUnlockedToggleControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class PoliteNotifVibrateUnlockedToggleControllerTest { 
    public void isAvailable_flagEnabled_vibrationSupported_shouldReturnTrue() {

        // TODO: b/291907312 - remove feature flags

        mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);

        mSetFlagsRule.enableFlags(Flags.FLAG_VIBRATE_WHILE_UNLOCKED);

        when(mVibrator.hasVibrator()).thenReturn(true);

        assertThat(mController.isAvailable()).isTrue();

        assertThat(mController.getAvailabilityStatus()).isEqualTo(
@@ -74,6 +75,7 @@ public class PoliteNotifVibrateUnlockedToggleControllerTest { 
    public void isAvailable_flagEnabled_vibrationNotSupported_shouldReturnFalse() {

        // TODO: b/291907312 - remove feature flags

        mSetFlagsRule.enableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);

        mSetFlagsRule.enableFlags(Flags.FLAG_VIBRATE_WHILE_UNLOCKED);

        when(mVibrator.hasVibrator()).thenReturn(false);

        assertThat(mController.isAvailable()).isFalse();

        assertThat(mController.getAvailabilityStatus()).isEqualTo(
@@ -84,6 +86,7 @@ public class PoliteNotifVibrateUnlockedToggleControllerTest { 
    public void isAvailable_flagDisabled_shouldReturnFalse() {

        // TODO: b/291907312 - remove feature flags

        mSetFlagsRule.disableFlags(Flags.FLAG_POLITE_NOTIFICATIONS);

        mSetFlagsRule.enableFlags(Flags.FLAG_VIBRATE_WHILE_UNLOCKED);

        assertThat(mController.isAvailable()).isFalse();

        assertThat(mController.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);