diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-25 20:33:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-25 20:33:26 +0000 |
commit | 552e6c803c51cf36191a79e93e0c573a60be5ba9 (patch) | |
tree | 2f8fa19c8dab128b506d30c4acd490c3e05643bc /src/com/android/launcher3/Launcher.java | |
parent | 9c7ed9e9da9dfcac5158b5108891736d716ddee8 (diff) | |
parent | 27288381a1e29203cd9b1354ac0b25705e55ac9a (diff) | |
download | android_packages_apps_Trebuchet-552e6c803c51cf36191a79e93e0c573a60be5ba9.tar.gz android_packages_apps_Trebuchet-552e6c803c51cf36191a79e93e0c573a60be5ba9.tar.bz2 android_packages_apps_Trebuchet-552e6c803c51cf36191a79e93e0c573a60be5ba9.zip |
Merge "Theming on Scrim- and GradientView" into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f00fef512..ff7ca812b 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -99,6 +99,7 @@ import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.dragndrop.PinItemDragListener; import com.android.launcher3.dynamicui.ExtractedColors; +import com.android.launcher3.dynamicui.WallpaperColorInfo; import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.keyboard.CustomActionsPopup; @@ -149,7 +150,8 @@ import java.util.Set; public class Launcher extends BaseActivity implements LauncherExterns, View.OnClickListener, OnLongClickListener, LauncherModel.Callbacks, View.OnTouchListener, LauncherProviderChangeListener, - AccessibilityManager.AccessibilityStateChangeListener { + AccessibilityManager.AccessibilityStateChangeListener, + WallpaperColorInfo.OnThemeChangeListener { public static final String TAG = "Launcher"; static final boolean LOGD = false; @@ -365,6 +367,10 @@ public class Launcher extends BaseActivity mLauncherCallbacks.preOnCreate(); } + WallpaperColorInfo wallpaperColorInfo = WallpaperColorInfo.getInstance(this); + wallpaperColorInfo.setOnThemeChangeListener(this); + overrideTheme(wallpaperColorInfo.isDark()); + super.onCreate(savedInstanceState); LauncherAppState app = LauncherAppState.getInstance(this); @@ -464,6 +470,17 @@ public class Launcher extends BaseActivity } @Override + public void onThemeChanged() { + recreate(); + } + + protected void overrideTheme(boolean isDark) { + if (isDark) { + setTheme(R.style.LauncherThemeDark); + } + } + + @Override public View findViewById(int id) { return mLauncherView.findViewById(id); } @@ -1856,6 +1873,8 @@ public class Launcher extends BaseActivity ((AccessibilityManager) getSystemService(ACCESSIBILITY_SERVICE)) .removeAccessibilityStateChangeListener(this); + WallpaperColorInfo.getInstance(this).setOnThemeChangeListener(null); + LauncherAnimUtils.onDestroyActivity(); if (mLauncherCallbacks != null) { |