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

Commit 5afdffd1 authored by Wilson Wu's avatar Wilson Wu
Browse files

Simplify the default keyboard vibration state 

Remove the config_defaultKeyboardVibrationEnabled
device config to avoid confusion. Use a fixed value
for default like other vibration settings.

Flag: EXEMPT refactor
Bug: 332660772
Test: build
Change-Id: I9060fbc83087599fa0d9a56be3de27a2dcf15a94
parent c6848845

core/java/android/os/Vibrator.java

+0 −10
Original line number Diff line number Diff line
@@ -183,16 +183,6 @@ public abstract class Vibrator { 
        return getConfig().getDefaultVibrationIntensity(usage);

    }



    /**

     * Whether the keyboard vibration is enabled by default.

     *

     * @return {@code true} if the keyboard vibration is default enabled, {@code false} otherwise.

     * @hide

     */

    public boolean isDefaultKeyboardVibrationEnabled() {

        return getConfig().isDefaultKeyboardVibrationEnabled();

    }



    /**

     * Return the ID of this vibrator.

     *

core/java/android/os/vibrator/VibrationConfig.java

+0 −13
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ public class VibrationConfig { 
    @VibrationIntensity

    private final int mDefaultRingVibrationIntensity;



    private final boolean mDefaultKeyboardVibrationEnabled;



    private final boolean mKeyboardVibrationSettingsSupported;



    /** @hide */
@@ -87,8 +85,6 @@ public class VibrationConfig { 


        mIgnoreVibrationsOnWirelessCharger = loadBoolean(resources,

                com.android.internal.R.bool.config_ignoreVibrationsOnWirelessCharger, false);

        mDefaultKeyboardVibrationEnabled = loadBoolean(resources,

                com.android.internal.R.bool.config_defaultKeyboardVibrationEnabled, true);

        mKeyboardVibrationSettingsSupported = loadBoolean(resources,

                com.android.internal.R.bool.config_keyboardVibrationSettingsSupported, false);
@@ -193,14 +189,6 @@ public class VibrationConfig { 
        return mIgnoreVibrationsOnWirelessCharger;

    }



    /**

     * Whether keyboard vibration settings is enabled by default.

     * @hide

     */

    public boolean isDefaultKeyboardVibrationEnabled() {

        return mDefaultKeyboardVibrationEnabled;

    }



    /**

     * Whether the device support keyboard vibration settings.

     * @hide
@@ -248,7 +236,6 @@ public class VibrationConfig { 
                + ", mDefaultMediaIntensity=" + mDefaultMediaVibrationIntensity

                + ", mDefaultNotificationIntensity=" + mDefaultNotificationVibrationIntensity

                + ", mDefaultRingIntensity=" + mDefaultRingVibrationIntensity

                + ", mDefaultKeyboardVibrationEnabled=" + mDefaultKeyboardVibrationEnabled

                + ", mKeyboardVibrationSettingsSupported=" + mKeyboardVibrationSettingsSupported

                + "}";

    }

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -4133,9 +4133,6 @@ 
         and should depend on the touch feedback intensity user setting -->

    <item name="config_keyboardHapticFeedbackFixedAmplitude" format="float" type="dimen">-1</item>



    <!-- The default value for keyboard vibration toggle in settings. -->

    <bool name="config_defaultKeyboardVibrationEnabled">true</bool>



    <!-- Indicating if keyboard vibration settings supported or not. -->

    <bool name="config_keyboardVibrationSettingsSupported">false</bool>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2112,7 +2112,6 @@ 
  <java-symbol type="integer" name="config_defaultVibrationAmplitude" />

  <java-symbol type="dimen" name="config_hapticChannelMaxVibrationAmplitude" />

  <java-symbol type="dimen" name="config_keyboardHapticFeedbackFixedAmplitude" />

  <java-symbol type="bool" name="config_defaultKeyboardVibrationEnabled" />

  <java-symbol type="bool" name="config_keyboardVibrationSettingsSupported" />

  <java-symbol type="integer" name="config_vibrationWaveformRampStepDuration" />

  <java-symbol type="bool" name="config_ignoreVibrationsOnWirelessCharger" />

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

+4 −7
Original line number Diff line number Diff line
@@ -557,8 +557,8 @@ final class VibrationSettings { 
            mVibrateInputDevices =

                    loadSystemSetting(Settings.System.VIBRATE_INPUT_DEVICES, 0, userHandle) > 0;

            mVibrateOn = loadSystemSetting(Settings.System.VIBRATE_ON, 1, userHandle) > 0;

            mKeyboardVibrationOn = loadSystemSetting(Settings.System.KEYBOARD_VIBRATION_ENABLED,

                    mVibrationConfig.isDefaultKeyboardVibrationEnabled() ? 1 : 0, userHandle) > 0;

            mKeyboardVibrationOn = loadSystemSetting(

                    Settings.System.KEYBOARD_VIBRATION_ENABLED, 1, userHandle) > 0;



            int alarmIntensity = toIntensity(

                    loadSystemSetting(Settings.System.ALARM_VIBRATION_INTENSITY, -1, userHandle),
@@ -645,12 +645,10 @@ final class VibrationSettings { 
                        .append("), ");

            }

            vibrationIntensitiesString.append('}');

            String keyboardVibrationOnString = mKeyboardVibrationOn

                    + " (default: " + mVibrationConfig.isDefaultKeyboardVibrationEnabled() + ")";

            return "VibrationSettings{"

                    + "mVibratorConfig=" + mVibrationConfig

                    + ", mVibrateOn=" + mVibrateOn

                    + ", mKeyboardVibrationOn=" + keyboardVibrationOnString

                    + ", mKeyboardVibrationOn=" + mKeyboardVibrationOn

                    + ", mVibrateInputDevices=" + mVibrateInputDevices

                    + ", mBatterySaverMode=" + mBatterySaverMode

                    + ", mRingerMode=" + ringerModeToString(mRingerMode)
@@ -667,8 +665,7 @@ final class VibrationSettings { 
            pw.println("VibrationSettings:");

            pw.increaseIndent();

            pw.println("vibrateOn = " + mVibrateOn);

            pw.println("keyboardVibrationOn = " + mKeyboardVibrationOn

                    + ", default: " + mVibrationConfig.isDefaultKeyboardVibrationEnabled());

            pw.println("keyboardVibrationOn = " + mKeyboardVibrationOn);

            pw.println("vibrateInputDevices = " + mVibrateInputDevices);

            pw.println("batterySaverMode = " + mBatterySaverMode);

            pw.println("ringerMode = " + ringerModeToString(mRingerMode));