commit 2772005888a3ad4ca2c643a7a3506fb629ed2bef
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 20 07:07:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 20 07:07:51 2020 +0000
tree 344f4908f0526063fea148f67870f2dcbee11e9f
parent ccaf403dcb7a38db2cdaac76f539c8e256fa836e
parent b5a3893f768c5c112e9cb39efc651dbe6d7225cd

Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76

Change-Id: Id0cf38066b99d6c77bc39aac55b81cd943b85460

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
+}