PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use super method for Vibration preferences" into rvc-d1-dev am: fa63980566

Browse Source 
Change-Id: I9c8c78981cdcac3fbee321c78392e8432fcba97a
This commit is contained in:
Vince Leung
2020-04-15 16:59:32 +00:00
committed by Automerger Merge Worker
parent 3cb796ad72 fa63980566
commit ed5f54623d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/notification/SoundSettings.java
View File

@@ -76,6 +76,7 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
private RingtonePreference mRequestPreference; private RingtonePreference mRequestPreference;
private UpdatableListPreferenceDialogFragment mDialogFragment; private UpdatableListPreferenceDialogFragment mDialogFragment;
private String mHfpOutputControllerKey; private String mHfpOutputControllerKey;
private String mVibrationPreferencesKey = "vibration_preference_screen";
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
@@ -127,6 +128,10 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
@Override @Override
public void onDisplayPreferenceDialog(Preference preference) { public void onDisplayPreferenceDialog(Preference preference) {
if (TextUtils.equals(mVibrationPreferencesKey, preference.getKey())) {
super.onDisplayPreferenceDialog(preference);
return;
}
final int metricsCategory; final int metricsCategory;
if (mHfpOutputControllerKey.equals(preference.getKey())) { if (mHfpOutputControllerKey.equals(preference.getKey())) {
metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES; metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES;
@@ -311,4 +316,4 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
mDialogFragment.onListPreferenceUpdated(preference); mDialogFragment.onListPreferenceUpdated(preference);
} }
} }
} }