Merge branch '5.1' of https://github.com/Team-Radium/frameworks_base into 5.1

Signed-off-by: W4TCH0UT <[email protected]>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java

Author: ateek-ujjawal

api/current.txt

@@ -9166,6 +9166,10 @@ package android.content.res {
     field public static final int UI_MODE_TYPE_TELEVISION = 4; // 0x4
     field public static final int UI_MODE_TYPE_UNDEFINED = 0; // 0x0
     field public static final int UI_MODE_TYPE_WATCH = 6; // 0x6
+    field public static final int UI_THEME_MODE_UNDEFINED = 0; // 0x0
+    field public static final int UI_THEME_MODE_NORMAL = 1; // 0x1
+    field public static final int UI_THEME_MODE_HOLO_DARK = 2; // 0x2
+    field public static final int UI_THEME_MODE_HOLO_LIGHT = 3; // 0x3
     field public int densityDpi;
     field public float fontScale;
     field public int hardKeyboardHidden;
@@ -9182,6 +9186,7 @@ package android.content.res {
     field public int screenWidthDp;
     field public int smallestScreenWidthDp;
     field public int touchscreen;
+    field public int uiThemeMode;
     field public int uiMode;
   }
 

core/java/android/app/IUiModeManager.aidl

@@ -51,4 +51,16 @@ interface IUiModeManager {
      * 2 for night, and 3 for automatic mode switching.
      */
     int getNightMode();
+
+    /**
+     * Sets the system ui theme mode. Only the system can do this.
+     *
+     * possible theme modes @link Configuration
+     * {@link #UI_THEME_MODE_NORMAL},
+     * {@link #UI_THEME_MODE_HOLO_DARK}, {@link #UI_THEME_MODE_HOLO_LIGHT}
+     *
+     * @hide
+     */
+    void setUiThemeMode(int mode);
+
 }

core/java/android/app/ResourcesManager.java

@@ -456,6 +456,7 @@ public final boolean applyConfigurationToResourcesLocked(Configuration config,
                 DisplayMetrics dm = defaultDisplayMetrics;
                 final boolean hasOverrideConfiguration = key.hasOverrideConfiguration();
                 boolean themeChanged = (changes & ActivityInfo.CONFIG_THEME_RESOURCE) != 0;
+                final boolean themeChanged2 = (changes & ActivityInfo.CONFIG_UI_THEME_MODE) != 0;
                 if (themeChanged) {
                     AssetManager am = r.getAssets();
                     if (am.hasThemeSupport()) {
@@ -487,7 +488,7 @@ public final boolean applyConfigurationToResourcesLocked(Configuration config,
                 } else {
                     r.updateConfiguration(config, dm, compat);
                 }
-                if (themeChanged) {
+                if (themeChanged || themeChanged2) {
                     r.updateStringCache();
                 }
                 //Slog.i(TAG, "Updated app resources " + v.getKey()

core/java/android/app/UiModeManager.java

@@ -234,4 +234,23 @@ public int getNightMode() {
         }
         return -1;
     }
+
+    /**
+     * Set system ui theme mode.
+     *
+     * possible theme modes @link Configuration
+     * {@link #UI_THEME_MODE_NORMAL},
+     * {@link #UI_THEME_MODE_HOLO_DARK}, {@link #UI_THEME_MODE_HOLO_LIGHT}
+     *
+     * @hide
+     */
+    public void setUiThemeMode(int mode) {
+        if (mService != null) {
+            try {
+                mService.setUiThemeMode(mode);
+            } catch (RemoteException e) {
+                Log.e(TAG, "setUiThemeMode: RemoteException", e);
+            }
+        }
+    }
 }

core/java/android/content/pm/ActivityInfo.java

@@ -504,6 +504,13 @@ public class ActivityInfo extends ComponentInfo
      * {@link android.R.attr#configChanges} attribute.
      */
     public static final int CONFIG_UI_MODE = 0x0200;
+    /**
+     * Bit in {@link #configChanges} that indicates that the activity
+     * can itself handle the inverted ui mode. Set from the
+     * {@link android.R.attr#configChanges} attribute.
+     * @hide
+     */
+    public static final int CONFIG_UI_THEME_MODE = 0x0300;
     /**
      * Bit in {@link #configChanges} that indicates that the activity
      * can itself handle the screen size. Set from the
@@ -574,6 +581,7 @@ public class ActivityInfo extends ComponentInfo
         Configuration.NATIVE_CONFIG_NAVIGATION,             // NAVIGATION
         Configuration.NATIVE_CONFIG_ORIENTATION,            // ORIENTATION
         Configuration.NATIVE_CONFIG_SCREEN_LAYOUT,          // SCREEN LAYOUT
+        Configuration.NATIVE_CONFIG_UI_THEME_MODE,          // UI THEME MODE
         Configuration.NATIVE_CONFIG_UI_MODE,                // UI MODE
         Configuration.NATIVE_CONFIG_SCREEN_SIZE,            // SCREEN SIZE
         Configuration.NATIVE_CONFIG_SMALLEST_SCREEN_SIZE,   // SMALLEST SCREEN SIZE

core/java/android/content/pm/PackageParser.java

@@ -907,7 +907,7 @@ private Package parseBaseApk(File apkFile, AssetManager assets, int flags)
         XmlResourceParser parser = null;
         try {
             res = new Resources(assets, mMetrics, null);
-            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     Build.VERSION.RESOURCES_SDK_INT);
             parser = assets.openXmlResourceParser(cookie, ANDROID_MANIFEST_FILENAME);
 
@@ -961,7 +961,7 @@ private void parseSplitApk(Package pkg, int splitIndex, AssetManager assets, int
         XmlResourceParser parser = null;
         try {
             res = new Resources(assets, mMetrics, null);
-            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     Build.VERSION.RESOURCES_SDK_INT);
             parser = assets.openXmlResourceParser(cookie, ANDROID_MANIFEST_FILENAME);
 
@@ -1258,7 +1258,7 @@ public static ApkLite parseApkLite(File apkFile, int flags)
         XmlResourceParser parser = null;
         try {
             assets = new AssetManager();
-            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            assets.setConfiguration(0, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                     Build.VERSION.RESOURCES_SDK_INT);
 
             int cookie = assets.addAssetPath(apkPath);

core/java/android/content/res/AssetManager.java

@@ -887,7 +887,7 @@ public native final void setConfiguration(int mcc, int mnc, String locale,
             int orientation, int touchscreen, int density, int keyboard,
             int keyboardHidden, int navigation, int screenWidth, int screenHeight,
             int smallestScreenWidthDp, int screenWidthDp, int screenHeightDp,
-            int screenLayout, int uiMode, int majorVersion);
+            int screenLayout, int uiThemeMode, int uiMode, int majorVersion);
 
     /**
      * Retrieve the resource identifier for the given resource name.

core/java/android/content/res/Configuration.java

@@ -465,6 +465,45 @@ public boolean isLayoutSizeAtLeast(int size) {
      */
     public int orientation;
 
+    /** Constant for {@link #uiThemeMode}
+     * value that corresponds to the
+     * ui theme mode framework
+     * resource qualifier.
+     * value indicating that no mode has been set.
+     * @hide
+    */
+    public static final int UI_THEME_MODE_UNDEFINED = 0;
+    /** Constant for {@link #uiThemeMode}
+     * value that corresponds to the
+     * stock themed framework
+     * resource qualifier.
+     * @hide
+    */
+    public static final int UI_THEME_MODE_NORMAL = 1;
+    /** Constant for {@link #uiThemeMode}
+     * value that corresponds to the
+     * dark themed framework
+     * resource qualifier.
+     * @hide
+    */
+    public static final int UI_THEME_MODE_HOLO_DARK = 2;
+    /** Constant for {@link #uiThemeMode}
+     * value that corresponds to the
+     * light themed framework
+     * resource qualifier.
+     * @hide
+    */
+    public static final int UI_THEME_MODE_HOLO_LIGHT = 3;
+
+    /**
+     * Bit for the ui theme mode.
+     * This may be one of {@link #UI_THEME_MODE_UNDEFINED},
+     * {@link #UI_THEME_MODE_NORMAL},
+     * {@link #UI_THEME_MODE_HOLO_DARK}, {@link #UI_THEME_MODE_HOLO_LIGHT},
+     * @hide
+     */
+    public int uiThemeMode;
+
     /** Constant for {@link #uiMode}: bits that encode the mode type. */
     public static final int UI_MODE_TYPE_MASK = 0x0f;
     /** Constant for {@link #uiMode}: a {@link #UI_MODE_TYPE_MASK}
@@ -642,6 +681,8 @@ public boolean isLayoutSizeAtLeast(int size) {
     public static final int NATIVE_CONFIG_VERSION = 0x0400;
     /** @hide Native-specific bit mask for SCREEN_LAYOUT config; DO NOT USE UNLESS YOU ARE SURE. */
     public static final int NATIVE_CONFIG_SCREEN_LAYOUT = 0x0800;
+    /** @hide Native-specific bit mask for UI_THEME_MODE config; DO NOT USE UNLESS YOU ARE SURE. */
+    public static final int NATIVE_CONFIG_UI_THEME_MODE = 0x0900;
     /** @hide Native-specific bit mask for UI_MODE config; DO NOT USE UNLESS YOU ARE SURE. */
     public static final int NATIVE_CONFIG_UI_MODE = 0x1000;
     /** @hide Native-specific bit mask for SMALLEST_SCREEN_SIZE config; DO NOT USE UNLESS YOU
@@ -681,6 +722,7 @@ public void setTo(Configuration o) {
         navigationHidden = o.navigationHidden;
         orientation = o.orientation;
         screenLayout = o.screenLayout;
+        uiThemeMode = o.uiThemeMode;
         uiMode = o.uiMode;
         screenWidthDp = o.screenWidthDp;
         screenHeightDp = o.screenHeightDp;
@@ -768,6 +810,14 @@ public String toString() {
             case ORIENTATION_PORTRAIT: sb.append(" port"); break;
             default: sb.append(" orien="); sb.append(orientation); break;
         }
+        switch (uiThemeMode) {
+            case UI_THEME_MODE_UNDEFINED: sb.append(" ?uithememode"); break;
+            /* normal is not interesting to print it is default behaviour*/
+            case UI_THEME_MODE_NORMAL: break;
+            case UI_THEME_MODE_HOLO_DARK: sb.append(" darktheme"); break;
+            case UI_THEME_MODE_HOLO_LIGHT: sb.append(" lighttheme"); break;
+            default: sb.append(" uiThemeMode="); sb.append(uiThemeMode); break;
+        }
         switch ((uiMode&UI_MODE_TYPE_MASK)) {
             case UI_MODE_TYPE_UNDEFINED: sb.append(" ?uimode"); break;
             case UI_MODE_TYPE_NORMAL: /* normal is not interesting to print */ break;
@@ -851,6 +901,7 @@ public void setToDefaults() {
         navigationHidden = NAVIGATIONHIDDEN_UNDEFINED;
         orientation = ORIENTATION_UNDEFINED;
         screenLayout = SCREENLAYOUT_UNDEFINED;
+        uiThemeMode = UI_THEME_MODE_UNDEFINED;
         uiMode = UI_MODE_TYPE_UNDEFINED;
         screenWidthDp = compatScreenWidthDp = SCREEN_WIDTH_DP_UNDEFINED;
         screenHeightDp = compatScreenHeightDp = SCREEN_HEIGHT_DP_UNDEFINED;
@@ -956,6 +1007,11 @@ public int updateFrom(Configuration delta) {
                 screenLayout = delta.screenLayout;
             }
         }
+        if (delta.uiThemeMode != UI_THEME_MODE_UNDEFINED
+                && uiThemeMode != delta.uiThemeMode) {
+            changed |= ActivityInfo.CONFIG_UI_THEME_MODE;
+            uiThemeMode = delta.uiThemeMode;
+        }
         if (delta.uiMode != (UI_MODE_TYPE_UNDEFINED|UI_MODE_NIGHT_UNDEFINED)
                 && uiMode != delta.uiMode) {
             changed |= ActivityInfo.CONFIG_UI_MODE;
@@ -1101,6 +1157,10 @@ && getScreenLayoutNoDirection(screenLayout) !=
                     getScreenLayoutNoDirection(delta.screenLayout)) {
             changed |= ActivityInfo.CONFIG_SCREEN_LAYOUT;
         }
+        if (delta.uiThemeMode != UI_THEME_MODE_UNDEFINED
+                && uiThemeMode != delta.uiThemeMode) {
+            changed |= ActivityInfo.CONFIG_UI_THEME_MODE;
+        }
         if (delta.uiMode != (UI_MODE_TYPE_UNDEFINED|UI_MODE_NIGHT_UNDEFINED)
                 && uiMode != delta.uiMode) {
             changed |= ActivityInfo.CONFIG_UI_MODE;
@@ -1211,6 +1271,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(navigationHidden);
         dest.writeInt(orientation);
         dest.writeInt(screenLayout);
+        dest.writeInt(uiThemeMode);
         dest.writeInt(uiMode);
         dest.writeInt(screenWidthDp);
         dest.writeInt(screenHeightDp);
@@ -1240,6 +1301,7 @@ public void readFromParcel(Parcel source) {
         navigationHidden = source.readInt();
         orientation = source.readInt();
         screenLayout = source.readInt();
+        uiThemeMode = source.readInt();
         uiMode = source.readInt();
         screenWidthDp = source.readInt();
         screenHeightDp = source.readInt();
@@ -1308,6 +1370,8 @@ public int compareTo(Configuration that) {
         if (n != 0) return n;
         n = this.screenLayout - that.screenLayout;
         if (n != 0) return n;
+        n = this.uiThemeMode - that.uiThemeMode;
+        if (n != 0) return n;
         n = this.uiMode - that.uiMode;
         if (n != 0) return n;
         n = this.screenWidthDp - that.screenWidthDp;
@@ -1354,6 +1418,7 @@ public int hashCode() {
         result = 31 * result + navigationHidden;
         result = 31 * result + orientation;
         result = 31 * result + screenLayout;
+        result = 31 * result + uiThemeMode;
         result = 31 * result + uiMode;
         result = 31 * result + screenWidthDp;
         result = 31 * result + screenHeightDp;

core/java/android/content/res/Resources.java

@@ -1951,7 +1951,8 @@ public void updateConfiguration(Configuration config,
                     keyboardHidden, mConfiguration.navigation, width, height,
                     mConfiguration.smallestScreenWidthDp,
                     mConfiguration.screenWidthDp, mConfiguration.screenHeightDp,
-                    mConfiguration.screenLayout, mConfiguration.uiMode,
+                    mConfiguration.screenLayout,
+                    mConfiguration.uiThemeMode, mConfiguration.uiMode,
                     Build.VERSION.RESOURCES_SDK_INT);
 
             if (DEBUG_CONFIG) {
@@ -2018,10 +2019,21 @@ private void clearDrawableCachesLocked(
 
     private void clearDrawableCacheLocked(
             LongSparseArray<WeakReference<ConstantState>> cache, int configChanges) {
+
         /*
          * Quick test to find out if the config change that occurred should
          * trigger a full cache wipe.
          */
+
+        if (Configuration.needNewResources(configChanges, ActivityInfo.CONFIG_UI_THEME_MODE)) {
+            if (DEBUG_CONFIG) {
+                Log.d(TAG, "Clear drawable cache from config changes: 0x"
+                        + Integer.toHexString(configChanges));
+            }
+            cache.clear();
+            return;
+        }
+
         if (Configuration.needNewResources(configChanges, 0)) {
             if (DEBUG_CONFIG) {
                 Log.d(TAG, "Clear drawable cache from config changes: 0x"
@@ -2465,6 +2477,11 @@ private boolean verifyPreloadConfig(int changingConfigurations, int allowVarying
     public final void updateStringCache() {
         synchronized (mAccessLock) {
             mAssets.recreateStringBlocks();
+	}
+        if (mTmpValue != null) {
+            synchronized (mTmpValue) {
+                mAssets.recreateStringBlocks();
+            }
         }
     }
 

core/java/android/provider/Settings.java

@@ -4481,6 +4481,12 @@ public static void setShowGTalkServiceStatusForUser(ContentResolver cr, boolean
          */
         public static final String LOCK_SCREEN_MAX_NOTIFICATIONS = "lock_screen_max_notifications";
 
+        /**
+         * TRDS: Override custom notification and qs colors on theme change
+         * @hide
+         */
+        public static final String OVERRIDE_CUSTOM_COLORS = "override_custom_colors";
+
         /**
          * Settings to backup. This is here so that it's in the same place as the settings
          * keys and easy to update.
@@ -6709,6 +6715,21 @@ public static boolean putFloatForUser(ContentResolver cr, String name, float val
          */
         public static final String UI_NIGHT_MODE = "ui_night_mode";
 
+        /**
+         * The current theme mode that has been selected by the user.  Owned
+         * and controlled by UiModeManagerService.
+         * @hide
+         */
+        public static final String UI_THEME_MODE = "ui_theme_mode";
+
+        /**
+         * Auto theme mode which switches either based on daytime or lightsensor
+         * values: 0 = manual (default), 1 = auto twilight (based on daytime)
+         * 2 = auto lightsensor (based on light conditions)
+         * @hide
+         */
+        public static final String UI_THEME_AUTO_MODE = "ui_theme_auto_mode";
+
         /**
          * Whether screensavers are enabled.
          * @hide