aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move theme res logic to Themes static class.

Browse Source 
Bug: 131310726

Change-Id: Ib46c26c2b44165a4441e109eed6d3ae7e19bcf02
This commit is contained in:
Hyunyoung Song
2019-05-01 13:15:29 -07:00
parent d16f87f52d
commit fcd090da35
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/launcher3/BaseDraggingActivity.java
View File

@@ -36,6 +36,7 @@ import com.android.launcher3.model.AppLaunchTracker;
import com.android.launcher3.shortcuts.DeepShortcutManager;
import com.android.launcher3.uioverrides.DisplayRotationListener;
import com.android.launcher3.uioverrides.WallpaperColorInfo;
import com.android.launcher3.util.Themes;
import androidx.annotation.Nullable;
@@ -69,7 +70,7 @@ public abstract class BaseDraggingActivity extends BaseActivity
// Update theme
WallpaperColorInfo wallpaperColorInfo = WallpaperColorInfo.getInstance(this);
wallpaperColorInfo.addOnChangeListener(this);
int themeRes = getThemeRes(wallpaperColorInfo);
int themeRes = Themes.getActivityThemeRes(this);
if (themeRes != mThemeRes) {
mThemeRes = themeRes;
setTheme(themeRes);
@@ -88,31 +89,11 @@ public abstract class BaseDraggingActivity extends BaseActivity
}
private void updateTheme() {
WallpaperColorInfo wallpaperColorInfo = WallpaperColorInfo.getInstance(this);
if (mThemeRes != getThemeRes(wallpaperColorInfo)) {
if (mThemeRes != Themes.getActivityThemeRes(this)) {
recreate();
}
}
protected int getThemeRes(WallpaperColorInfo wallpaperColorInfo) {
boolean darkTheme;
if (Utilities.ATLEAST_Q) {
Configuration configuration = getResources().getConfiguration();
int nightMode = configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK;
darkTheme = nightMode == Configuration.UI_MODE_NIGHT_YES;
} else {
darkTheme = wallpaperColorInfo.isDark();
}
if (darkTheme) {
return wallpaperColorInfo.supportsDarkText() ?
R.style.AppTheme_Dark_DarkText : R.style.AppTheme_Dark;
} else {
return wallpaperColorInfo.supportsDarkText() ?
R.style.AppTheme_DarkText : R.style.AppTheme;
}
}
@Override
public void onActionModeStarted(ActionMode mode) {
super.onActionModeStarted(mode);