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

19
src/com/android/settings/gestures/PreventRingingGestureSettings.java
View File

@@ -63,19 +63,6 @@ public class PreventRingingGestureSettings extends DashboardFragment {
return 0;
}
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle());
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new PreventRingingPreferenceController(context, lifecycle,
UserHandle.myUserId(), KEY_PREVENT_RINGING));
return controllers;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -85,12 +72,6 @@ public class PreventRingingGestureSettings extends DashboardFragment {
sir.xmlResId = R.xml.prevent_ringing_gesture_settings;
return Arrays.asList(sir);
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null /* lifecycle */);
}
};
}