PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up the keyboard vibration config" into main

Browse Source
This commit is contained in:
Wilson Wu
2024-07-04 02:45:29 +00:00
committed by Android (Google) Code Review
parent 6632826881 789aacf499
commit 2ae9ed0297
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -235,9 +235,6 @@
Can be overridden for specific product builds if the target device does not support it --> Can be overridden for specific product builds if the target device does not support it -->
<bool name="config_media_vibration_supported">true</bool> <bool name="config_media_vibration_supported">true</bool>
<!-- Whether to show Keyboard vibration settings in the vibration and haptics screen. -->
<bool name="config_keyboard_vibration_supported">false</bool>
<!-- <!--
Whether or not the homepage should be powered by legacy suggestion (versus contextual cards) Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
Default to true as not all devices support contextual cards. Default to true as not all devices support contextual cards.

5
src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
View File

@@ -111,9 +111,8 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (Flags.keyboardCategoryEnabled() if (Flags.keyboardCategoryEnabled()
&& mContext.getResources().getBoolean(R.bool.config_keyboard_vibration_supported) && mContext.getResources().getBoolean(
&& mContext.getResources().getFloat( com.android.internal.R.bool.config_keyboardVibrationSettingsSupported)) {
com.android.internal.R.dimen.config_keyboardHapticFeedbackFixedAmplitude) > 0) {
return AVAILABLE; return AVAILABLE;
} }
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;

15
tests/robotests/src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceControllerTest.java
View File

@@ -88,10 +88,9 @@ public class KeyboardVibrationTogglePreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_featureSupported_available() { public void getAvailabilityStatus_featureSupported_available() {
mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED); mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(true); when(mResources.getBoolean(
when(mResources.getFloat( com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))
com.android.internal.R.dimen.config_keyboardHapticFeedbackFixedAmplitude)) .thenReturn(true);
.thenReturn(0.8f);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
} }
@@ -99,7 +98,9 @@ public class KeyboardVibrationTogglePreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_featureNotSupported_unavailable() { public void getAvailabilityStatus_featureNotSupported_unavailable() {
mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED); mSetFlagsRule.enableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(false); when(mResources.getBoolean(
com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))
.thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
} }
@@ -107,7 +108,9 @@ public class KeyboardVibrationTogglePreferenceControllerTest {
@Test @Test
public void getAvailabilityStatus_keyboardCategoryDisabled_unavailable() { public void getAvailabilityStatus_keyboardCategoryDisabled_unavailable() {
mSetFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED); mSetFlagsRule.disableFlags(Flags.FLAG_KEYBOARD_CATEGORY_ENABLED);
when(mResources.getBoolean(R.bool.config_keyboard_vibration_supported)).thenReturn(true); when(mResources.getBoolean(
com.android.internal.R.bool.config_keyboardVibrationSettingsSupported))
.thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
} }