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

Merge "Decrease memory usage for sleep idle test" into rvc-dev am: f1a65df04a am: 07081ae34e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931351

Change-Id: I222b266722c726c8346491a87107aace2168615a
This commit is contained in:
Jason Chiu
2020-06-22 07:27:48 +00:00
committed by Automerger Merge Worker
parent 23c1016d6d 07081ae34e
commit 0d96af8cea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/slices/SettingsSliceProvider.java
View File

@@ -143,7 +143,7 @@ public class SettingsSliceProvider extends SliceProvider {
@VisibleForTesting
final Map<Uri, SliceBackgroundWorker> mPinnedWorkers = new ArrayMap<>();
private boolean mNightMode;
private Boolean mNightMode;
public SettingsSliceProvider() {
super(READ_SEARCH_INDEXABLES);
@@ -153,8 +153,6 @@ public class SettingsSliceProvider extends SliceProvider {
public boolean onCreateSliceProvider() {
mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext());
mSliceWeakDataCache = new WeakHashMap<>();
mNightMode = Utils.isNightMode(getContext());
getContext().setTheme(R.style.Theme_SettingsBase);
return true;
}
@@ -207,7 +205,10 @@ public class SettingsSliceProvider extends SliceProvider {
}
final boolean nightMode = Utils.isNightMode(getContext());
if (mNightMode != nightMode) {
if (mNightMode == null) {
mNightMode = nightMode;
getContext().setTheme(R.style.Theme_SettingsBase);
} else if (mNightMode != nightMode) {
Log.d(TAG, "Night mode changed, reload theme");
mNightMode = nightMode;
getContext().getTheme().rebase();