commit 786a490dd78134c70fe22590cd8e9491e446b103
author jackqdyulei <jackqdyulei@google.com> Tue Oct 24 13:27:53 2017 -0700
committer jackqdyulei <jackqdyulei@google.com> Tue Oct 24 15:00:50 2017 -0700
tree f5e7e9ddf5cdd8e2dd716282ed41f1058f010dd2
parent 3a3ff7deeb200aa3757c8863f4eee7be044d2931

Renaming in BluetoothTile and QSDetailItems

Rename the fields so they could disclose the type.

1. Rename icon to iconResId(type: int)
2. Rename iconDrawable to icon(type QSTile.Icon)
3. Rename BluetoothBatteryDrawable to BluetoothBatteryTileIcon

Bug: 68008183
Test: Build

Change-Id: I5edb24c2fcfa114c2d7134898d4e2b2bcedf0758

packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
index 8869e8d..ddd9910 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
@@ -185,10 +185,10 @@
             }
             view.setVisibility(mItemsVisible ? VISIBLE : INVISIBLE);
             final ImageView iv = (ImageView) view.findViewById(android.R.id.icon);
-            if (item.iconDrawable != null) {
-                iv.setImageDrawable(item.iconDrawable.getDrawable(iv.getContext()));
+            if (item.icon != null) {
+                iv.setImageDrawable(item.icon.getDrawable(iv.getContext()));
             } else {
-                iv.setImageResource(item.icon);
+                iv.setImageResource(item.iconResId);
             }
             iv.getOverlay().clear();
             if (item.overlay != null) {
@@ -258,8 +258,8 @@
     }
 
     public static class Item {
-        public int icon;
-        public QSTile.Icon iconDrawable;
+        public int iconResId;
+        public QSTile.Icon icon;
         public Drawable overlay;
         public CharSequence line1;
         public CharSequence line2;