[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history
Change-Id: I0694e2236c4f7ecfb38583f3bb736f416991e434
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
+}