From 6b8bdaa9c802746eabc4e96686739dbce34c2fbc Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Sun, 10 Oct 2010 13:24:39 -0700
Subject: New AppsPermission and market style

Bug 3067333

Change-Id: Ibbf444cfd9b1e2d7b51f4194d57c6dee30ac18ee
---
 core/java/android/widget/AppSecurityPermissions.java  |   9 ++-------
 .../res/drawable-hdpi/ic_bullet_key_permission.png    | Bin 3255 -> 938 bytes
 core/res/res/layout/app_perms_summary.xml             |  18 ++++++++++--------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java
index aa14c81fb250..d3aa42f9a19b 100755
--- a/core/java/android/widget/AppSecurityPermissions.java
+++ b/core/java/android/widget/AppSecurityPermissions.java
@@ -17,14 +17,14 @@
 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.PackageManager.NameNotFoundException;
 import android.content.pm.PackageParser;
 import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -329,11 +329,6 @@ public class AppSecurityPermissions  implements View.OnClickListener {
 
         TextView permGrpView = (TextView) permView.findViewById(R.id.permission_group);
         TextView permDescView = (TextView) permView.findViewById(R.id.permission_list);
-        if (dangerous) {
-            final Resources resources = context.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-hdpi/ic_bullet_key_permission.png b/core/res/res/drawable-hdpi/ic_bullet_key_permission.png
index 98d95dcd6806..b6b840a4ae3f 100644
Binary files a/core/res/res/drawable-hdpi/ic_bullet_key_permission.png and b/core/res/res/drawable-hdpi/ic_bullet_key_permission.png differ
diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml
index 716074317987..bdbbfcb3b089 100755
--- a/core/res/res/layout/app_perms_summary.xml
+++ b/core/res/res/layout/app_perms_summary.xml
@@ -65,21 +65,23 @@
             android:layout_marginLeft="16dip"
             android:duplicateParentState="true">
 
-            <ImageView
-                android:id="@+id/show_more_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
             <TextView
                 android:id="@+id/show_more_text"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:duplicateParentState="true"
-                android:layout_alignTop="@id/show_more_icon"
+                android:layout_alignTop="@+id/show_more_icon"
                 android:layout_gravity="center_vertical"
-                android:paddingLeft="6dip"
-                android:layout_width="match_parent"
+                android:paddingLeft="36dip"
+                android:layout_weight="1"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
+            <ImageView
+                android:id="@id/show_more_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="12dip" />
+
         </LinearLayout>
 
         <View
-- 
cgit v1.2.3-59-g8ed1b