Fixes #1972593. Updates AppSecurityPermissions styles in Theme.Light

7 files changed, 10 insertions, 12 deletions

diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java
index c4b5ef8..6579660 100755
--- a/core/java/android/widget/AppSecurityPermissions.java
+++ b/core/java/android/widget/AppSecurityPermissions.java
@@ -18,6 +18,7 @@ package android.widget;
 
 import com.android.internal.R;
 import android.content.Context;
+import android.content.res.Resources;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageParser;
@@ -319,15 +320,14 @@ public class AppSecurityPermissions  implements View.OnClickListener {
             boolean dangerous) {
         View permView = mInflater.inflate(R.layout.app_permission_item, null);
         Drawable icon = dangerous ? mDangerousIcon : mNormalIcon;
-        int grpColor = dangerous ? R.color.perms_dangerous_grp_color :
-            R.color.perms_normal_grp_color;
-        int permColor = dangerous ? R.color.perms_dangerous_perm_color :
-            R.color.perms_normal_perm_color;
 
         TextView permGrpView = (TextView) permView.findViewById(R.id.permission_group);
         TextView permDescView = (TextView) permView.findViewById(R.id.permission_list);
-        permGrpView.setTextColor(mContext.getResources().getColor(grpColor));
-        permDescView.setTextColor(mContext.getResources().getColor(permColor));
+        if (dangerous) {
+            final Resources resources = mContext.getResources();
+            permGrpView.setTextColor(resources.getColor(R.color.perms_dangerous_grp_color));
+            permDescView.setTextColor(resources.getColor(R.color.perms_dangerous_perm_color));
+        }
 
         ImageView imgView = (ImageView)permView.findViewById(R.id.perm_icon);
         imgView.setImageDrawable(icon);
diff --git a/core/res/res/drawable/expander_ic_maximized.9.png b/core/res/res/drawable/expander_ic_maximized.9.png
index eb461e9..778255a 100644
--- a/core/res/res/drawable/expander_ic_maximized.9.png
+++ b/core/res/res/drawable/expander_ic_maximized.9.png
diff --git a/core/res/res/drawable/expander_ic_minimized.9.png b/core/res/res/drawable/expander_ic_minimized.9.png
index e3cec8d..5235c18 100644
--- a/core/res/res/drawable/expander_ic_minimized.9.png
+++ b/core/res/res/drawable/expander_ic_minimized.9.png
diff --git a/core/res/res/drawable/ic_bullet_key_permission.png b/core/res/res/drawable/ic_bullet_key_permission.png
index c8a4939..ccb010f 100755..100644
--- a/core/res/res/drawable/ic_bullet_key_permission.png
+++ b/core/res/res/drawable/ic_bullet_key_permission.png
diff --git a/core/res/res/drawable/ic_text_dot.png b/core/res/res/drawable/ic_text_dot.png
index bb02379..47913f6 100755..100644
--- a/core/res/res/drawable/ic_text_dot.png
+++ b/core/res/res/drawable/ic_text_dot.png
diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml
index 713c179..009eb8f 100755
--- a/core/res/res/layout/app_perms_summary.xml
+++ b/core/res/res/layout/app_perms_summary.xml
@@ -54,7 +54,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="@android:drawable/divider_horizontal_dark" />
+            android:background="?android:attr/listDivider" />
 
         <LinearLayout
             android:orientation="horizontal"
@@ -85,7 +85,7 @@
         <View
             android:layout_width="fill_parent"
             android:layout_height="1dip"
-            android:background="@android:drawable/divider_horizontal_dark" />
+            android:background="?android:attr/listDivider" />
 
     </LinearLayout>
 
diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml
index b7de997..0fd6861 100644
--- a/core/res/res/values/colors.xml
+++ b/core/res/res/values/colors.xml
@@ -68,10 +68,8 @@
     <color name="darker_gray">#aaa</color>
 
     <!-- For security permissions -->
-    <color name="perms_dangerous_grp_color">#ffd57e</color>
-    <color name="perms_dangerous_perm_color">#ddb66a</color>
-    <color name="perms_normal_grp_color">#eeeeee</color>
-    <color name="perms_normal_perm_color">#c0c0c0</color>
+    <color name="perms_dangerous_grp_color">#dd6826</color>
+    <color name="perms_dangerous_perm_color">#dd6826</color>
     
     <!-- For search-related UIs -->
     <color name="search_url_text_normal">#7fa87f</color>