From 4e816be8898e3bfa73f7550092110a19f9c81219 Mon Sep 17 00:00:00 2001
From: David Magno <david.magno@sony.com>
Date: Mon, 13 Feb 2023 15:55:27 +0100
Subject: [PATCH] Make Media Vibration setting configurable

Add a configuration boolean to control whether or not to display
Media Vibration switch (default: display the switch).
This configuration can then be overriden by OEMs for devices
that don't support media vibration.

Bug: 268657239
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
        "com.android.settings.accessibility.MediaVibration"
Change-Id: I91857fbb04abc97b290559895010c3cbeef7ebab
---
 res/values/config.xml                         |  4 +++
 ...ibrationIntensityPreferenceController.java |  5 ++-
 ...iaVibrationTogglePreferenceController.java |  4 ++-
 ...tionIntensityPreferenceControllerTest.java | 36 ++++++++++++++++++-
 ...brationTogglePreferenceControllerTest.java | 36 +++++++++++++++++++
 5 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index dbaabdf3041..0cab087473b 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -217,6 +217,10 @@
     -->
     <integer name="config_vibration_supported_intensity_levels">1</integer>
 
+    <!-- Whether or not to show Media vibration settings in the vibration and haptics screen.
+         Can be overridden for specific product builds if the target device does not support it -->
+    <bool name="config_media_vibration_supported">true</bool>
+
     <!--
         Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
         Default to true as not all devices support contextual cards.
diff --git a/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java
index 0678e584991..36e7d4cf636 100644
--- a/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceController.java
@@ -20,6 +20,8 @@ import android.content.Context;
 import android.os.VibrationAttributes;
 import android.provider.Settings;
 
+import com.android.settings.R;
+
 /** Preference controller for am vibration intensity */
 public class MediaVibrationIntensityPreferenceController
         extends VibrationIntensityPreferenceController {
@@ -46,6 +48,7 @@ public class MediaVibrationIntensityPreferenceController
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return mContext.getResources().getBoolean(R.bool.config_media_vibration_supported) ?
+                AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 }
diff --git a/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java b/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java
index f7b0e394a0c..c663ad4040e 100644
--- a/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java
+++ b/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceController.java
@@ -19,6 +19,7 @@ package com.android.settings.accessibility;
 import android.content.Context;
 
 import com.android.settings.accessibility.MediaVibrationIntensityPreferenceController.MediaVibrationPreferenceConfig;
+import com.android.settings.R;
 
 /** Preference controller for alarm vibration with only a toggle for on/off states. */
 public class MediaVibrationTogglePreferenceController extends VibrationTogglePreferenceController {
@@ -29,6 +30,7 @@ public class MediaVibrationTogglePreferenceController extends VibrationTogglePre
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return mContext.getResources().getBoolean(R.bool.config_media_vibration_supported) ?
+                AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
index e0eff0e71de..355e8c32041 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationIntensityPreferenceControllerTest.java
@@ -31,10 +31,13 @@ import androidx.preference.PreferenceScreen;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.widget.SeekBarPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,7 +48,7 @@ import org.robolectric.annotation.Config;
 
 /** Test for {@link MediaVibrationIntensityPreferenceController}. */
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowInteractionJankMonitor.class})
+@Config(shadows = {ShadowInteractionJankMonitor.class, SettingsShadowResources.class})
 public class MediaVibrationIntensityPreferenceControllerTest {
 
     private static final String PREFERENCE_KEY = "preference_key";
@@ -76,6 +79,11 @@ public class MediaVibrationIntensityPreferenceControllerTest {
         mController.displayPreference(mScreen);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void verifyConstants() {
         assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
@@ -156,6 +164,32 @@ public class MediaVibrationIntensityPreferenceControllerTest {
                 .isEqualTo(Vibrator.VIBRATION_INTENSITY_HIGH);
     }
 
+    @Test
+    public void configForMediaVibration_enabled_shouldShowSlider() {
+        SettingsShadowResources.overrideResource(R.bool.config_media_vibration_supported, true);
+        mController.updateState(mPreference);
+
+        final boolean mediaVibrationConfig = mContext.getResources()
+                .getBoolean(R.bool.config_media_vibration_supported);
+
+        assertThat(mediaVibrationConfig).isTrue();
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mController.isSupported()).isTrue();
+    }
+
+    @Test
+    public void configForMediaVibration_disabled_shouldHideSlider() {
+        SettingsShadowResources.overrideResource(R.bool.config_media_vibration_supported, false);
+        mController.updateState(mPreference);
+
+        final boolean mediaVibrationConfig = mContext.getResources()
+                .getBoolean(R.bool.config_media_vibration_supported);
+
+        assertThat(mediaVibrationConfig).isFalse();
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.isSupported()).isFalse();
+    }
+
     private void updateSetting(String key, int value) {
         Settings.System.putInt(mContext.getContentResolver(), key, value);
     }
diff --git a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
index 49a7b7b0c03..501bbb0e102 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MediaVibrationTogglePreferenceControllerTest.java
@@ -32,17 +32,22 @@ import androidx.preference.SwitchPreference;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.R;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
 import org.robolectric.RobolectricTestRunner;
 
 /** Test for {@link MediaVibrationIntensityPreferenceController}. */
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResources.class})
 public class MediaVibrationTogglePreferenceControllerTest {
 
     private static final String PREFERENCE_KEY = "preference_key";
@@ -72,6 +77,11 @@ public class MediaVibrationTogglePreferenceControllerTest {
         mController.displayPreference(mScreen);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void verifyConstants() {
         assertThat(mController.getPreferenceKey()).isEqualTo(PREFERENCE_KEY);
@@ -144,6 +154,32 @@ public class MediaVibrationTogglePreferenceControllerTest {
                 .isEqualTo(Vibrator.VIBRATION_INTENSITY_OFF);
     }
 
+    @Test
+    public void configForMediaVibration_enabled_shouldShowToogle() {
+        SettingsShadowResources.overrideResource(R.bool.config_media_vibration_supported, true);
+        mController.updateState(mPreference);
+
+        final boolean mediaVibrationConfig = mContext.getResources()
+                .getBoolean(R.bool.config_media_vibration_supported);
+
+        assertThat(mediaVibrationConfig).isTrue();
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mController.isSupported()).isTrue();
+    }
+
+    @Test
+    public void configForMediaVibration_disabled_shouldHideToggle() {
+        SettingsShadowResources.overrideResource(R.bool.config_media_vibration_supported, false);
+        mController.updateState(mPreference);
+
+        final boolean mediaVibrationConfig = mContext.getResources()
+                .getBoolean(R.bool.config_media_vibration_supported);
+
+        assertThat(mediaVibrationConfig).isFalse();
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mController.isSupported()).isFalse();
+    }
+
     private void updateSetting(String key, int value) {
         Settings.System.putInt(mContext.getContentResolver(), key, value);
     }