Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0119a67e authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents 8ede6274 ff7705e1

core/java/android/widget/AppSecurityPermissions.java

+2 −3
Original line number Diff line number Diff line
@@ -218,15 +218,14 @@ public class AppSecurityPermissions implements View.OnClickListener { 
        mShowMore.setClickable(true);

        mShowMore.setOnClickListener(this);

        mShowMore.setFocusable(true);

        mShowMore.setBackgroundResource(android.R.drawable.list_selector_background);



        // Pick up from framework resources instead.

        mDefaultGrpLabel = mContext.getString(R.string.default_permission_group);

        mPermFormat = mContext.getString(R.string.permissions_format);

        mNormalIcon = mContext.getResources().getDrawable(R.drawable.ic_text_dot);

        mDangerousIcon = mContext.getResources().getDrawable(R.drawable.ic_bullet_key_permission);

        mShowMaxIcon = mContext.getResources().getDrawable(R.drawable.expander_ic_maximized);

        mShowMinIcon = mContext.getResources().getDrawable(R.drawable.expander_ic_minimized);

        mShowMaxIcon = mContext.getResources().getDrawable(R.drawable.expander_close_holo_dark);

        mShowMinIcon = mContext.getResources().getDrawable(R.drawable.expander_open_holo_dark);

        

        // Set permissions view

        setPermissions(mPermsList);

core/res/res/layout/app_perms_summary.xml

+5 −4
Original line number Diff line number Diff line
@@ -60,10 +60,11 @@ 
            android:orientation="horizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dip"

            android:layout_marginBottom="12dip"

            android:layout_marginLeft="16dip"

            android:duplicateParentState="true">

            android:paddingTop="16dip"

            android:paddingBottom="12dip"

            android:paddingLeft="16dip"

            android:duplicateParentState="true"

            android:background="?android:attr/selectableItemBackground">



            <TextView

                android:id="@+id/show_more_text"