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

Merge "Support Vibrate for calls in Settings Slices"

Browse Source
This commit is contained in:
Fan Zhang
2018-05-16 17:22:29 +00:00
committed by Android (Google) Code Review
parent e483bf7f92 5d772136e1
commit 7d6539d09b
4 changed files with 129 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,6 @@ public class SoundSettings extends DashboardFragment {
private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
private static final int REQUEST_CODE = 200;
private static final String KEY_ZEN_MODE = "zen_mode";
private static final int SAMPLE_CUTOFF = 2000; // manually cap sample playback at 2 seconds
@VisibleForTesting
@@ -237,7 +236,6 @@ public class SoundSettings extends DashboardFragment {
SoundSettings fragment, Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePreferenceController(context, lifecycle, KEY_ZEN_MODE));
controllers.add(new VibrateWhenRingPreferenceController(context));
// Volumes are added via xml