diff options
| author | Roman Birg <roman@cyngn.com> | 2016-07-08 12:55:09 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-07-08 12:57:26 -0700 |
| commit | 68eda0632a2e05b4c53a5ca57209583d8fbe6267 (patch) | |
| tree | 8b6e64f67aacf41dfae2b0ca5987e8cebf392fab /packages/SystemUI/src/com/android/systemui/qs | |
| parent | d145bd5d3b6c69c3e1d6e6ad0c259c28972a5cb9 (diff) | |
| download | frameworks_base-68eda0632a2e05b4c53a5ca57209583d8fbe6267.zip frameworks_base-68eda0632a2e05b4c53a5ca57209583d8fbe6267.tar.gz frameworks_base-68eda0632a2e05b4c53a5ca57209583d8fbe6267.tar.bz2 | |
SystemUI: add themes dynamic tiles icon
Resolves the themes tile having the default android activity icon. Also
resolves other dynamic tiles not being queried properly.
Ticket: OSS NIGHTLIES-2967
Change-Id: I532eeaef417195f3148915b777e7ab175b1089aa
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java index 3ec1b83..13f552c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java @@ -1953,6 +1953,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On if (split != null && split.length > 2) { return split[1]; } + return spec; } return null; } @@ -1967,15 +1968,15 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On /** for {@link cyanogenmod.app.StatusBarPanelCustomTile#persistableKey()} **/ return split[2]; } + return spec; } return null; } private Drawable getQSTileIcon(String spec) { - if (QSUtils.isDynamicQsTile(spec)) { - return QSTile.ResourceIcon.get( - QSUtils.getDynamicQSTileResIconId(mContext, UserHandle.myUserId(), spec)) - .getDrawable(mContext); + if (QSUtils.isDynamicQsTile(extractTileTagFromSpec(spec))) { + return QSTile.ResourceIcon.get(QSUtils.getDynamicQSTileResIconId(mContext, + UserHandle.myUserId(), extractTileTagFromSpec(spec))).getDrawable(mContext); } else if (QSUtils.isStaticQsTile(spec)) { final int res = QSTileHost.getIconResource(spec); if (res != 0) { |