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

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

View File

@@ -34,11 +34,17 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro
private static final int MY_USER = UserHandle.myUserId();
private final AmbientDisplayConfiguration mConfig;
private final OnPreferenceChangedCallback mCallback;
public interface OnPreferenceChangedCallback {
void onPreferenceChanged();
}
public AmbientDisplayAlwaysOnPreferenceController(Context context,
AmbientDisplayConfiguration config) {
AmbientDisplayConfiguration config, OnPreferenceChangedCallback callback) {
super(context);
mConfig = config;
mCallback = callback;
}
@Override
@@ -55,6 +61,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceContro
public boolean onPreferenceChange(Preference preference, Object newValue) {
int enabled = (boolean) newValue ? 1 : 0;
Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ALWAYS_ON, enabled);
if (mCallback != null) {
mCallback.onPreferenceChanged();
}
return true;
}