commit bd88f396dc812f7c90df74e79830fd1948225cfa
author Sunny Goyal <sunnygoyal@google.com> Thu Jun 07 15:42:57 2018 -0700
committer Sunny Goyal <sunnygoyal@google.com> Fri Jun 08 11:20:01 2018 -0700
tree dd601d73573845372cf8375e443b2768515ddefe
parent 53d57998c17cf9f2ba48daa8a5f41f3a5eac514d

Defining a base theme, which can be overriden by derivative projects without
affecting launcher theme

Bug: 70220582
Change-Id: Ie3069686be5e6a42910e90541db2d6b5b79e25c1

src/com/android/launcher3/BaseDraggingActivity.java

diff --git a/src/com/android/launcher3/BaseDraggingActivity.java b/src/com/android/launcher3/BaseDraggingActivity.java
index 8af9acc..eec196e 100644
--- a/src/com/android/launcher3/BaseDraggingActivity.java
+++ b/src/com/android/launcher3/BaseDraggingActivity.java
@@ -61,7 +61,7 @@
 
     private OnStartCallback mOnStartCallback;
 
-    private int mThemeRes = R.style.LauncherTheme;
+    private int mThemeRes = R.style.AppTheme;
 
     private DisplayRotationListener mRotationListener;
 
@@ -91,10 +91,10 @@
     protected int getThemeRes(WallpaperColorInfo wallpaperColorInfo) {
         if (wallpaperColorInfo.isDark()) {
             return wallpaperColorInfo.supportsDarkText() ?
-                    R.style.LauncherThemeDark_DarKText : R.style.LauncherThemeDark;
+                    R.style.AppTheme_Dark_DarkText : R.style.AppTheme_Dark;
         } else {
             return wallpaperColorInfo.supportsDarkText() ?
-                    R.style.LauncherTheme_DarkText : R.style.LauncherTheme;
+                    R.style.AppTheme_DarkText : R.style.AppTheme;
         }
     }