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

Commit 3139297f authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 7035 into donut 

* changes:
  Fixes #1972593. Updates AppSecurityPermissions styles in Theme.Light
parents c353268c 17606f88

core/java/android/widget/AppSecurityPermissions.java

+6 −6
Original line number Diff line number Diff line
@@ -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);

core/res/res/drawable/expander_ic_maximized.9.png

−646 B (1.12 KiB)
Loading image diff...

core/res/res/drawable/expander_ic_minimized.9.png

−585 B (1.14 KiB)
Loading image diff...

core/res/res/drawable/ic_bullet_key_permission.png

100755 → 100644
+13 B (597 B)
Loading image diff...

core/res/res/drawable/ic_text_dot.png

100755 → 100644
+144 B (476 B)
Loading image diff...