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

Revert "Support AOD in the Universal Settings API"

Browse Source 
This reverts commit 537c2cfc2c.

Fixes: 77278897

Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
This commit is contained in:
Fan Zhang
2018-03-29 20:20:08 +00:00
parent 537c2cfc2c
commit f75edca09f
5 changed files with 100 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/display/AmbientDisplaySettings.java
View File

@@ -40,23 +40,23 @@ import java.util.List;
*/
public class AmbientDisplaySettings extends DashboardFragment {
public static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
private static final String TAG = "AmbientDisplaySettings";
private static final int MY_USER_ID = UserHandle.myUserId();
private static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
private static final String KEY_AMBIENT_DISPLAY_DOUBLE_TAP = "ambient_display_double_tap";
private static final String KEY_AMBIENT_DISPLAY_PICK_UP = "ambient_display_pick_up";
private static final String KEY_AMBIENT_DISPLAY_NOTIFICATION = "ambient_display_notification";
private AmbientDisplayConfiguration mConfig;
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, AmbientDisplayConfiguration config,
MetricsFeatureProvider metricsFeatureProvider) {
MetricsFeatureProvider metricsFeatureProvider,
AmbientDisplayAlwaysOnPreferenceController.OnPreferenceChangedCallback aodCallback) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
metricsFeatureProvider));
controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config,
aodCallback));
controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle, config,
MY_USER_ID, KEY_AMBIENT_DISPLAY_DOUBLE_TAP));
controllers.add(new PickupGesturePreferenceController(context, lifecycle, config,
@@ -64,14 +64,6 @@ public class AmbientDisplaySettings extends DashboardFragment {
return controllers;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
final AmbientDisplayAlwaysOnPreferenceController controller = use(
AmbientDisplayAlwaysOnPreferenceController.class);
controller.setConfig(getConfig(context));
controller.setCallback(this::updatePreferenceStates);
}
@Override
protected String getLogTag() {
@@ -86,7 +78,8 @@ public class AmbientDisplaySettings extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(),
getConfig(context), mMetricsFeatureProvider);
new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
this::updatePreferenceStates);
}
@Override
@@ -111,14 +104,7 @@ public class AmbientDisplaySettings extends DashboardFragment {
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null,
new AmbientDisplayConfiguration(context), null);
new AmbientDisplayConfiguration(context), null, null);
}
};
private AmbientDisplayConfiguration getConfig(Context context) {
if (mConfig != null) {
mConfig = new AmbientDisplayConfiguration(context);
}
return mConfig;
}
}