diff options
| author | Jason Monk <jmonk@google.com> | 2015-05-13 16:01:16 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2015-05-13 16:07:57 -0400 |
| commit | 0e6cac26585b04dc9a357b03cab09d93404819f1 (patch) | |
| tree | be284a1413ad42596eca209b9b1654bc683b5791 /packages/SettingsLib | |
| parent | cf304fb35c2086601178858e307d3dda36dbbff7 (diff) | |
| download | frameworks_base-0e6cac26585b04dc9a357b03cab09d93404819f1.zip frameworks_base-0e6cac26585b04dc9a357b03cab09d93404819f1.tar.gz frameworks_base-0e6cac26585b04dc9a357b03cab09d93404819f1.tar.bz2 | |
Add default icon for permissions
Bug: 21119477
Change-Id: Ie982a1b42d2195ab79c33cf87756efb3bd9eab29
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java index 60b5ba5..7e68132 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java @@ -22,7 +22,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; import android.graphics.drawable.Drawable; -import android.graphics.drawable.ShapeDrawable; import android.os.AsyncTask; import android.os.Build; import android.os.UserHandle; @@ -80,7 +79,8 @@ public class PermissionsInfo { if (info.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) { group = new PermissionGroup(); // TODO: Add default permission icon. - group.icon = info.icon != 0 ? info.loadIcon(mPm) : new ShapeDrawable(); + group.icon = info.icon != 0 ? info.loadIcon(mPm) : mContext.getDrawable( + com.android.internal.R.drawable.ic_perm_device_info); group.name = info.name; group.label = info.loadLabel(mPm).toString(); mGroups.add(group); @@ -103,7 +103,8 @@ public class PermissionsInfo { for (PermissionGroupInfo groupInfo : groups) { PermissionGroup group = new PermissionGroup(); // TODO: Add default permission icon. - group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : new ShapeDrawable(); + group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : mContext.getDrawable( + com.android.internal.R.drawable.ic_perm_device_info); group.name = groupInfo.name; group.label = groupInfo.loadLabel(mPm).toString(); synchronized (mGroups) { |