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

Merge "Prevent ringing updates" into pi-dev am: dbffb1812d

Browse Source 
am: 8176af9610

Change-Id: I880b80215cfec3897b18200b18bedbb6c899e241
This commit is contained in:
Julia Reynolds
2018-04-10 16:15:11 -07:00
committed by android-build-merger
parent 3b3e951b6f 8176af9610
commit a660cf1176
11 changed files with 35 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/gestures/GestureSettings.java
View File

@@ -65,19 +65,6 @@ public class GestureSettings extends DashboardFragment {
return R.xml.gestures;
}
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
}
static List<AbstractPreferenceController> buildPreferenceControllers(
@NonNull Context context, @Nullable Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new PreventRingingPreferenceController(
context, lifecycle, UserHandle.myUserId(), KEY_PREVENT_RINGING));
return controllers;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
@@ -103,12 +90,6 @@ public class GestureSettings extends DashboardFragment {
return Arrays.asList(sir);
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
@@ -119,6 +100,7 @@ public class GestureSettings extends DashboardFragment {
keys.add(KEY_DOUBLE_TWIST);
keys.add(KEY_DOUBLE_TAP_SCREEN);
keys.add(KEY_PICK_UP);
keys.add(KEY_PREVENT_RINGING);
return keys;
}