commit d1670efe921ea14197b45597a03fd30408bd7070
author Amy Hsu <amyhsu@google.com> Wed May 20 08:58:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 20 08:58:08 2020 +0000
tree ef982f54bd64bad69beb504cae354e48f6e00bb8
parent 8233c0573f9317720753f31f2b2605ea900e4455
parent cf0ef7ae385a1c88bfb841b0eb1addce133c8da6

Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f am: cf0ef7ae38

Change-Id: Id8eef41275fc48fe5e84531fd87277189b265f81

src/com/android/settings/notification/SoundSettings.java

diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 9e7f3ed..b088fe3 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -76,6 +76,7 @@
     private RingtonePreference mRequestPreference;
     private UpdatableListPreferenceDialogFragment mDialogFragment;
     private String mHfpOutputControllerKey;
+    private String mVibrationPreferencesKey = "vibration_preference_screen";
 
     @Override
     public int getMetricsCategory() {
@@ -127,6 +128,10 @@
 
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
+        if (TextUtils.equals(mVibrationPreferencesKey, preference.getKey())) {
+            super.onDisplayPreferenceDialog(preference);
+            return;
+        }
         final int metricsCategory;
         if (mHfpOutputControllerKey.equals(preference.getKey())) {
             metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES;
@@ -310,4 +315,4 @@
             mDialogFragment.onListPreferenceUpdated(preference);
         }
     }
-}
\ No newline at end of file
+}