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

Disable lift-to-wake when always-on is checked

Browse Source 
The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
This commit is contained in:
Geoffrey Pitsch
2017-07-10 10:30:05 -04:00
parent 75bcd075f2
commit 57adc290d2
7 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,11 +51,13 @@ public class AmbientDisplaySettings extends DashboardFragment {
private static List<PreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, AmbientDisplayConfiguration config,
MetricsFeatureProvider metricsFeatureProvider) {
MetricsFeatureProvider metricsFeatureProvider,
AmbientDisplayAlwaysOnPreferenceController.OnPreferenceChangedCallback aodCallback) {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
metricsFeatureProvider));
controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config));
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,
@@ -77,7 +79,8 @@ public class AmbientDisplaySettings extends DashboardFragment {
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(),
new AmbientDisplayConfiguration(context), mMetricsFeatureProvider);
new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
() -> { updatePreferenceStates(); });
}
@Override
@@ -101,7 +104,7 @@ public class AmbientDisplaySettings extends DashboardFragment {
@Override
public List<PreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null,
new AmbientDisplayConfiguration(context), null);
new AmbientDisplayConfiguration(context), null, null);
}
};
}