Merge "Make WakeScreen conditionally avaialable"

This commit is contained in:
TreeHugger Robot
2019-02-13 23:42:22 +00:00
committed by Android (Google) Code Review
3 changed files with 41 additions and 7 deletions

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