Merge "Change to use CaseMap.toTitle in shortcut type summary to handle different locale." into rvc-dev am: 966f0527ac
Change-Id: If3c22c3061a0cc184129626dc8ef1161cdc53a9a
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
+}