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

Merge "Update dark theme slice for new display criteria"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-04 13:37:21 +00:00
committed by Android (Google) Code Review
parent 72a3827f68 1f3429a25d
commit 85587fc0c1
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
View File

@@ -162,11 +162,10 @@ public class DarkThemeSlice implements CustomSliceable {
@VisibleForTesting
boolean isAvailable(Context context) {
// checking dark theme mode.
if (isDarkThemeMode(context)) {
// check if dark theme mode is enabled or if dark theme scheduling is on.
if (isDarkThemeMode(context) || isNightModeScheduled()) {
return false;
}
// checking the current battery level
final BatteryManager batteryManager = context.getSystemService(BatteryManager.class);
final int level = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY);
@@ -186,6 +185,18 @@ public class DarkThemeSlice implements CustomSliceable {
sSliceClicked = clicked;
}
private boolean isNightModeScheduled() {
final int mode = mUiModeManager.getNightMode();
if (DEBUG) {
Log.d(TAG, "night mode : " + mode);
}
// Turn on from sunset to sunrise or turn on at custom time
if (mode == UiModeManager.MODE_NIGHT_AUTO || mode == UiModeManager.MODE_NIGHT_CUSTOM) {
return true;
}
return false;
}
public static class DarkThemeWorker extends SliceBackgroundWorker<Void> {
private final Context mContext;
private final ContentObserver mContentObserver =