Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2

Browse Source
This commit is contained in:
Amith Yamasani
2011-05-31 13:58:34 -07:00
committed by Android (Google) Code Review
parent 8ede62745f ff7705e1d3
commit 0119a67e72
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,15 +218,14 @@ public class AppSecurityPermissions implements View.OnClickListener {
mShowMore.setClickable(true); mShowMore.setClickable(true);
mShowMore.setOnClickListener(this); mShowMore.setOnClickListener(this);
mShowMore.setFocusable(true); mShowMore.setFocusable(true);
mShowMore.setBackgroundResource(android.R.drawable.list_selector_background);
// Pick up from framework resources instead. // Pick up from framework resources instead.
mDefaultGrpLabel = mContext.getString(R.string.default_permission_group); mDefaultGrpLabel = mContext.getString(R.string.default_permission_group);
mPermFormat = mContext.getString(R.string.permissions_format); mPermFormat = mContext.getString(R.string.permissions_format);
mNormalIcon = mContext.getResources().getDrawable(R.drawable.ic_text_dot); mNormalIcon = mContext.getResources().getDrawable(R.drawable.ic_text_dot);
mDangerousIcon = mContext.getResources().getDrawable(R.drawable.ic_bullet_key_permission); mDangerousIcon = mContext.getResources().getDrawable(R.drawable.ic_bullet_key_permission);
mShowMaxIcon = mContext.getResources().getDrawable(R.drawable.expander_ic_maximized); mShowMaxIcon = mContext.getResources().getDrawable(R.drawable.expander_close_holo_dark);
mShowMinIcon = mContext.getResources().getDrawable(R.drawable.expander_ic_minimized); mShowMinIcon = mContext.getResources().getDrawable(R.drawable.expander_open_holo_dark);
// Set permissions view // Set permissions view
setPermissions(mPermsList); setPermissions(mPermsList);

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

@@ -60,10 +60,11 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dip" android:paddingTop="16dip"
android:layout_marginBottom="12dip" android:paddingBottom="12dip"
android:layout_marginLeft="16dip" android:paddingLeft="16dip"
android:duplicateParentState="true"> android:duplicateParentState="true"
android:background="?android:attr/selectableItemBackground">
<TextView <TextView
android:id="@+id/show_more_text" android:id="@+id/show_more_text"