diff options
| author | Keith Mok <kmok@cyngn.com> | 2015-11-20 11:51:04 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-23 11:43:43 -0800 |
| commit | a3d6b093e78840b7a60295c6d5b9bdc75f9f3833 (patch) | |
| tree | a63d5bdfb0c00ded951929a4afa1963473d2071a /src/com/android/settings/Utils.java | |
| parent | b55f89de1e0c8a8631551c02efcc091d0ee07b5d (diff) | |
| download | packages_apps_Settings-a3d6b093e78840b7a60295c6d5b9bdc75f9f3833.zip packages_apps_Settings-a3d6b093e78840b7a60295c6d5b9bdc75f9f3833.tar.gz packages_apps_Settings-a3d6b093e78840b7a60295c6d5b9bdc75f9f3833.tar.bz2 | |
Only use device custom icon if it provides one
In function updateTileToSpecificActivityFromMetaDataOrRemove
it tries to get devices specific icon from the meta data
and set the iconPkg to the device specific package without
checking the device actually provides one.
This override the Settings default icon whatever the
device specific icon is provided or not.
Change-Id: I5d973617948a5dae0c7c1797f6f2b6bd7787a75a
Diffstat (limited to 'src/com/android/settings/Utils.java')
| -rw-r--r-- | src/com/android/settings/Utils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 4e945ef..5d3980f 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -372,8 +372,10 @@ public final class Utils { } // Set icon, title and summary for the preference - tile.iconRes = icon; - tile.iconPkg = resolveInfo.activityInfo.packageName; + if (icon != 0) { + tile.iconRes = icon; + tile.iconPkg = resolveInfo.activityInfo.packageName; + } tile.title = title; tile.summary = summary; // Replace the intent with this specific activity |