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

Make WakeScreen conditionally avaialable

Browse Source 
Also moving the setting closer to 'Always On'

Fixes: 124389844
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WakeScreenGesturePreferenceController
Change-Id: Ic19e01bf4259608dc0430507fbb3ce5ebf6fa456
This commit is contained in:
Lucas Dupin
2019-02-13 13:08:09 -08:00
parent cd15971f14
commit 862aaed38c
3 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java
View File

@@ -53,7 +53,18 @@ public class WakeScreenGesturePreferenceController extends GesturePreferenceCont
|| !mFeatureProvider.isSupported(mContext)) {
return UNSUPPORTED_ON_DEVICE;
}
return mFeatureProvider.isEnabled(mContext) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
if (!mFeatureProvider.isEnabled(mContext)) {
return CONDITIONALLY_UNAVAILABLE;
}
return getAmbientConfig().alwaysOnEnabled(mUserId)
? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}
@Override
protected boolean canHandleClicks() {
return getAmbientConfig().alwaysOnEnabled(mUserId);
}
@Override