diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-07-30 13:43:39 +0100 |
|---|---|---|
| committer | Alexandra Gherghina <alexgherghina@google.com> | 2014-07-31 15:43:11 +0000 |
| commit | a709314537164d959a18ee78768c69c4a9cb33c7 (patch) | |
| tree | 7d882c9d5eb6f85ea5d6cf792118f3b3fa63e596 /core/java/android/content | |
| parent | 9d8ca0f010a752d078023dee833c7b2131210291 (diff) | |
| download | frameworks_base-a709314537164d959a18ee78768c69c4a9cb33c7.zip frameworks_base-a709314537164d959a18ee78768c69c4a9cb33c7.tar.gz frameworks_base-a709314537164d959a18ee78768c69c4a9cb33c7.tar.bz2 | |
Use the appropriate default icon
ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.
Bug: 16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/pm/ApplicationInfo.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/pm/ComponentInfo.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageItemInfo.java | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 482ad6e..548a0c9 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -839,7 +839,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { /** * @hide */ - @Override protected Drawable loadDefaultIcon(PackageManager pm) { + @Override + public Drawable loadDefaultIcon(PackageManager pm) { if ((flags & FLAG_EXTERNAL_STORAGE) != 0 && isPackageUnavailable(pm)) { return Resources.getSystem().getDrawable( diff --git a/core/java/android/content/pm/ComponentInfo.java b/core/java/android/content/pm/ComponentInfo.java index 7e8f285..cc06b67 100644 --- a/core/java/android/content/pm/ComponentInfo.java +++ b/core/java/android/content/pm/ComponentInfo.java @@ -179,7 +179,8 @@ public class ComponentInfo extends PackageItemInfo { /** * @hide */ - @Override protected Drawable loadDefaultIcon(PackageManager pm) { + @Override + public Drawable loadDefaultIcon(PackageManager pm) { return applicationInfo.loadIcon(pm); } diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index 4b5bdda..cacdf8e 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -187,7 +187,7 @@ public class PackageItemInfo { * * @hide */ - protected Drawable loadDefaultIcon(PackageManager pm) { + public Drawable loadDefaultIcon(PackageManager pm) { return pm.getDefaultActivityIcon(); } |