drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6b8bdaa9: New AppsPermission and market style

Browse Source 
Merge commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc' into gingerbread-plus-aosp

* commit '6b8bdaa9c802746eabc4e96686739dbce34c2fbc':
  New AppsPermission and market style
This commit is contained in:
Gilles Debunne
2010-10-10 18:08:25 -07:00
committed by Android Git Automerger
parent 89fbcd72fb 6b8bdaa9c8
commit 1457bb0ef6
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/AppSecurityPermissions.java
View File

@ -17,14 +17,14 @@
package android.widget; package android.widget;
import com.android.internal.R; import com.android.internal.R;
import android.content.Context; import android.content.Context;
import android.content.res.Resources;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageParser; import android.content.pm.PackageParser;
import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionGroupInfo;
import android.content.pm.PermissionInfo; import android.content.pm.PermissionInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -329,11 +329,6 @@ public class AppSecurityPermissions implements View.OnClickListener {
TextView permGrpView = (TextView) permView.findViewById(R.id.permission_group); TextView permGrpView = (TextView) permView.findViewById(R.id.permission_group);
TextView permDescView = (TextView) permView.findViewById(R.id.permission_list); 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); ImageView imgView = (ImageView)permView.findViewById(R.id.perm_icon);
imgView.setImageDrawable(icon); imgView.setImageDrawable(icon);

BIN
core/res/res/drawable-hdpi/ic_bullet_key_permission.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 938 B

18
core/res/res/layout/app_perms_summary.xml
View File

@ -65,21 +65,23 @@
android:layout_marginLeft="16dip" android:layout_marginLeft="16dip"
android:duplicateParentState="true"> android:duplicateParentState="true">
<ImageView
android:id="@+id/show_more_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/show_more_text" android:id="@+id/show_more_text"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:duplicateParentState="true" android:duplicateParentState="true"
android:layout_alignTop="@id/show_more_icon" android:layout_alignTop="@+id/show_more_icon"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="6dip" android:paddingLeft="36dip"
android:layout_width="match_parent" android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="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> </LinearLayout>
<View <View