From a5a7976dfcc2d4a44f969dc8cb1d79635ae2f1f5 Mon Sep 17 00:00:00 2001
From: cgspine <cgspine@gmail.com>
Date: Tue, 26 Dec 2017 11:40:24 +0800
Subject: [PATCH] =?UTF-8?q?remove=20prefix=20android:=20of=20colorPrimary?=
 =?UTF-8?q?=E3=80=81colorPrimaryDark=20and=20so=20on=20in=20compat=20theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qmui/src/main/res/values-v21/qmui_themes_compat.xml |  8 --------
 qmui/src/main/res/values/qmui_themes_compat.xml     | 12 +++++++++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/qmui/src/main/res/values-v21/qmui_themes_compat.xml b/qmui/src/main/res/values-v21/qmui_themes_compat.xml
index 6bdad3754..e83c34c3d 100644
--- a/qmui/src/main/res/values-v21/qmui_themes_compat.xml
+++ b/qmui/src/main/res/values-v21/qmui_themes_compat.xml
@@ -2,15 +2,7 @@
 <resources>
 
     <style name="AppConfigTheme.Compat" parent="AppBaseTheme.Compat" >
-        <item name="android:colorPrimary">?attr/qmui_config_color_blue</item>
-        <item name="android:colorPrimaryDark">?attr/qmui_config_color_blue</item>
-        <item name="android:colorAccent">?attr/qmui_config_color_blue</item>
-        <item name="android:textColorPrimary">?attr/qmui_config_color_blue</item>
-        <item name="android:textColorSecondary">?attr/qmui_config_color_blue</item> <!--返回箭头也是用这个颜色-->
-        <item name="android:windowBackground">@color/qmui_config_color_white</item>
         <item name="android:navigationBarColor">?attr/qmui_config_color_black</item>
-        <item name="android:colorControlNormal">@color/qmui_config_color_white</item>
-        <item name="android:editTextColor">?attr/qmui_config_color_black</item>
         <!-- 该行会影响顶部条收起时效果,为false时，状态栏颜色不会被改变 -->
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
diff --git a/qmui/src/main/res/values/qmui_themes_compat.xml b/qmui/src/main/res/values/qmui_themes_compat.xml
index 2e0092968..85ebea156 100644
--- a/qmui/src/main/res/values/qmui_themes_compat.xml
+++ b/qmui/src/main/res/values/qmui_themes_compat.xml
@@ -15,7 +15,17 @@
         <item name="android:textViewStyle">@style/TextView.Compat</item>
     </style>
 
-    <style name="AppConfigTheme.Compat" parent="AppBaseTheme.Compat"/>
+
+    <style name="AppConfigTheme.Compat" parent="AppBaseTheme.Compat" >
+        <item name="colorPrimary">?attr/qmui_config_color_blue</item>
+        <item name="colorPrimaryDark">?attr/qmui_config_color_blue</item>
+        <item name="colorAccent">?attr/qmui_config_color_blue</item>
+        <item name="colorControlNormal">@color/qmui_config_color_white</item>
+        <item name="android:textColorPrimary">?attr/qmui_config_color_blue</item>
+        <item name="android:textColorSecondary">?attr/qmui_config_color_blue</item> <!--返回箭头也是用这个颜色-->
+        <item name="android:windowBackground">@color/qmui_config_color_white</item>
+        <item name="android:editTextColor">?attr/qmui_config_color_black</item>
+    </style>
 
     <style name="QMUI.Compat" parent="AppConfigTheme.Compat">
         <item name="qmui_content_padding_horizontal">@dimen/qmui_content_padding_horizontal