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

Commit 55102216 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Android (Google) Code Review
Browse files

Merge "Delete keyboard_category_enabled flag (2/2)" into main

parents 3146a9a0 bc79a1e0

src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java

+1 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.net.Uri; 
import android.os.Handler;

import android.os.VibrationAttributes;

import android.os.Vibrator;

import android.os.vibrator.Flags;

import android.provider.Settings;

import android.util.Log;
@@ -110,8 +109,7 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc 


    @Override

    public int getAvailabilityStatus() {

        if (Flags.keyboardCategoryEnabled()

                && mContext.getResources().getBoolean(

        if (mContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_keyboardVibrationSettingsSupported)) {

            return AVAILABLE;

        }

tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java

+0 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.app.settings.SettingsEnums; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.os.vibrator.Flags;

import android.platform.test.flag.junit.SetFlagsRule;

import android.provider.Settings;
@@ -41,7 +40,6 @@ import androidx.preference.PreferenceScreen; 
import androidx.preference.SwitchPreference;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;

import com.android.settings.testutils.FakeFeatureFactory;



import org.junit.Before;
@@ -87,7 +85,6 @@ public class KeyboardVibrationTogglePreferenceControllerTest { 


    @Test

    public void getAvailabilityStatus_featureSupported_available() {

        mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        when(mResources.getBoolean(

                com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))

                .thenReturn(true);
@@ -97,7 +94,6 @@ public class KeyboardVibrationTogglePreferenceControllerTest { 


    @Test

    public void getAvailabilityStatus_featureNotSupported_unavailable() {

        mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        when(mResources.getBoolean(

                com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))

                .thenReturn(false);
@@ -105,15 +101,6 @@ public class KeyboardVibrationTogglePreferenceControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void getAvailabilityStatus_keyboardCategoryDisabled_unavailable() {

        mSetFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        when(mResources.getBoolean(

                com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))

                .thenReturn(true);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);

    }



    @Test

    public void updateState_mainVibrateDisabled_shouldReturnFalseForCheckedAndEnabled() {