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

Commit 7cc6ed84 authored by Ming-Shin Lu's avatar Ming-Shin Lu
Browse files

Delete keyboard_category_enabled flag (1/2) 

As keyboard_category_enabled feature has launched, remove the feature
flag since it's unnessary.

And, this CL is the preparation of removing CATEGORY_KEYBOARD vibration
attribute and logic, remove the flag declation & usage since no longer
need this flag.

Flag: EXEMPT flag removal
Bug: 332661766
Test: build
Test: atest HapticFeedbackVibrationProviderTest VibrationSettingsTest
Change-Id: Id0dde9986b954f08c31bb0ed652a47eb815575f2
parent c46b6a5b

core/java/android/os/vibrator/flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -18,13 +18,6 @@ flag { 
    bug: "291128479"

}



flag {

    namespace: "haptics"

    name: "keyboard_category_enabled"

    description: "Enables the independent keyboard vibration settings feature"

    bug: "289107579"

}



flag {

    namespace: "haptics"

    name: "adaptive_haptics_enabled"

services/core/java/com/android/server/vibrator/HapticFeedbackVibrationProvider.java

+1 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.os.VibrationAttributes; 
import android.os.VibrationEffect;

import android.os.Vibrator;

import android.os.VibratorInfo;

import android.os.vibrator.Flags;

import android.util.Slog;

import android.util.SparseArray;

import android.view.HapticFeedbackConstants;
@@ -348,7 +347,7 @@ public final class HapticFeedbackVibrationProvider { 
                predefinedEffectId = VibrationEffect.EFFECT_CLICK;

                predefinedEffectFallback = true;

        }

        if (Flags.keyboardCategoryEnabled() && mKeyboardVibrationFixedAmplitude > 0) {

        if (mKeyboardVibrationFixedAmplitude > 0) {

            if (mVibratorInfo.isPrimitiveSupported(primitiveId)) {

                return VibrationEffect.startComposition()

                        .addPrimitive(primitiveId, mKeyboardVibrationFixedAmplitude)
@@ -361,10 +360,6 @@ public final class HapticFeedbackVibrationProvider { 


    private VibrationAttributes createKeyboardVibrationAttributes(

            @HapticFeedbackConstants.PrivateFlags int privFlags) {

        // Use touch attribute when the keyboard category is disable.

        if (!Flags.keyboardCategoryEnabled()) {

            return TOUCH_VIBRATION_ATTRIBUTES;

        }

        // Use touch attribute when the haptic is not apply to IME.

        if ((privFlags & HapticFeedbackConstants.PRIVATE_FLAG_APPLY_INPUT_METHOD_SETTINGS) == 0) {

            return TOUCH_VIBRATION_ATTRIBUTES;

services/core/java/com/android/server/vibrator/VibrationSettings.java

+1 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import android.os.VibrationAttributes; 
import android.os.VibrationEffect;

import android.os.Vibrator;

import android.os.Vibrator.VibrationIntensity;

import android.os.vibrator.Flags;

import android.os.vibrator.VibrationConfig;

import android.provider.Settings;

import android.util.IndentingPrintWriter;
@@ -533,8 +532,7 @@ final class VibrationSettings { 
            return false;

        }



        if (Flags.keyboardCategoryEnabled()

                && mVibrationConfig.isKeyboardVibrationSettingsSupported()) {

        if (mVibrationConfig.isKeyboardVibrationSettingsSupported()) {

            int category = callerInfo.attrs.getCategory();

            if (usage == USAGE_TOUCH && category == CATEGORY_KEYBOARD) {

                // Keyboard touch has a different user setting.

services/tests/vibrator/src/com/android/server/vibrator/HapticFeedbackVibrationProviderTest.java

+0 −34
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.hardware.vibrator.IVibrator; 
import android.os.VibrationAttributes;

import android.os.VibrationEffect;

import android.os.VibratorInfo;

import android.os.vibrator.Flags;

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

import android.util.AtomicFile;

import android.util.SparseArray;
@@ -255,23 +254,8 @@ public class HapticFeedbackVibrationProviderTest { 
                .isEqualTo(VibrationEffect.get(EFFECT_TICK, false /* fallback */));

    }



    @Test

    public void testKeyboardHaptic_fixAmplitude_keyboardCategoryOff_defaultVibrationReturned() {

        mSetFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        mockVibratorPrimitiveSupport(PRIMITIVE_CLICK, PRIMITIVE_TICK);

        mockKeyboardVibrationFixedAmplitude(KEYBOARD_VIBRATION_FIXED_AMPLITUDE);



        HapticFeedbackVibrationProvider hapticProvider = createProviderWithDefaultCustomizations();



        assertThat(hapticProvider.getVibrationForHapticFeedback(KEYBOARD_TAP))

                .isEqualTo(VibrationEffect.get(EFFECT_CLICK, true /* fallback */));

        assertThat(hapticProvider.getVibrationForHapticFeedback(KEYBOARD_RELEASE))

                .isEqualTo(VibrationEffect.get(EFFECT_TICK, false /* fallback */));

    }



    @Test

    public void testKeyboardHaptic_fixAmplitude_keyboardCategoryOn_keyboardVibrationReturned() {

        mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        mockVibratorPrimitiveSupport(PRIMITIVE_CLICK, PRIMITIVE_TICK);

        mockKeyboardVibrationFixedAmplitude(KEYBOARD_VIBRATION_FIXED_AMPLITUDE);
@@ -345,25 +329,8 @@ public class HapticFeedbackVibrationProviderTest { 
        }

    }



    @Test

    public void testVibrationAttribute_keyboardCategoryOff_isIme_useTouchUsage() {

        mSetFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        HapticFeedbackVibrationProvider hapticProvider = createProviderWithDefaultCustomizations();



        for (int effectId : KEYBOARD_FEEDBACK_CONSTANTS) {

            VibrationAttributes attrs = hapticProvider.getVibrationAttributesForHapticFeedback(

                    effectId, /* flags */ 0,

                    HapticFeedbackConstants.PRIVATE_FLAG_APPLY_INPUT_METHOD_SETTINGS);

            assertWithMessage("Expected USAGE_TOUCH for effect " + effectId)

                    .that(attrs.getUsage()).isEqualTo(USAGE_TOUCH);

            assertWithMessage("Expected no CATEGORY_KEYBOARD for effect " + effectId)

                    .that(attrs.getCategory()).isEqualTo(CATEGORY_UNKNOWN);

        }

    }



    @Test

    public void testVibrationAttribute_keyboardCategoryOn_notIme_useTouchUsage() {

        mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        HapticFeedbackVibrationProvider hapticProvider = createProviderWithDefaultCustomizations();



        for (int effectId : KEYBOARD_FEEDBACK_CONSTANTS) {
@@ -378,7 +345,6 @@ public class HapticFeedbackVibrationProviderTest { 


    @Test

    public void testVibrationAttribute_keyboardCategoryOn_isIme_useImeFeedbackUsage() {

        mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);

        HapticFeedbackVibrationProvider hapticProvider = createProviderWithDefaultCustomizations();



        for (int effectId : KEYBOARD_FEEDBACK_CONSTANTS) {

services/tests/vibrator/src/com/android/server/vibrator/VibrationSettingsTest.java

+0 −5
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ import android.os.VibrationAttributes; 
import android.os.VibrationEffect;

import android.os.Vibrator;

import android.os.test.TestLooper;

import android.os.vibrator.Flags;

import android.os.vibrator.VibrationConfig;

import android.platform.test.annotations.RequiresFlagsEnabled;

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

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

import android.provider.Settings;
@@ -602,7 +600,6 @@ public class VibrationSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED)

    public void shouldIgnoreVibration_withKeyboardSettingsOff_shouldIgnoreKeyboardVibration() {

        setUserSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY, VIBRATION_INTENSITY_MEDIUM);

        setUserSetting(Settings.System.KEYBOARD_VIBRATION_ENABLED, 0 /* OFF*/);
@@ -627,7 +624,6 @@ public class VibrationSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED)

    public void shouldIgnoreVibration_withKeyboardSettingsOn_shouldNotIgnoreKeyboardVibration() {

        setUserSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY, VIBRATION_INTENSITY_OFF);

        setUserSetting(Settings.System.KEYBOARD_VIBRATION_ENABLED, 1 /* ON */);
@@ -645,7 +641,6 @@ public class VibrationSettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED)

    public void shouldIgnoreVibration_notSupportKeyboardVibration_ignoresKeyboardTouchVibration() {

        setUserSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY, VIBRATION_INTENSITY_OFF);

        setUserSetting(Settings.System.KEYBOARD_VIBRATION_ENABLED, 1 /* ON */);