From 72a6387ce45f4fd4742c0ce4c0d055dc3405d55a Mon Sep 17 00:00:00 2001
From: Muyuan Li <muyuanli@google.com>
Date: Sat, 14 May 2016 11:35:41 -0700
Subject: [PATCH] sysui: refactor for extensibility.

Add dimens for qs detail icons.

Bug: 28748510
Change-Id: Ic2e5d8948af6d081a2554139f9ffeec0c5946696
(cherry picked from commit cdaea618b5a4e28a336295cdc9abd30e018f6a4b)
---
 packages/SystemUI/res/layout/qs_detail_item.xml            | 7 ++++---
 packages/SystemUI/res/values/dimens.xml                    | 6 ++++++
 .../src/com/android/systemui/qs/QSDetailItems.java         | 6 ++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml
index 5bb4f5d040197..7876ada2590d6 100644
--- a/packages/SystemUI/res/layout/qs_detail_item.xml
+++ b/packages/SystemUI/res/layout/qs_detail_item.xml
@@ -26,9 +26,10 @@
 
     <ImageView
         android:id="@android:id/icon"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginEnd="20dp" />
+        android:layout_width="@dimen/qs_detail_item_icon_size"
+        android:layout_height="@dimen/qs_detail_item_icon_size"
+        android:layout_marginStart="@dimen/qs_detail_item_icon_marginStart"
+        android:layout_marginEnd="@dimen/qs_detail_item_icon_marginEnd" />
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 63362cc8ea40a..70322856b5615 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -216,6 +216,12 @@
     <dimen name="qs_expand_margin">0dp</dimen>
     <dimen name="qs_battery_padding">2dp</dimen>
     <dimen name="qs_detail_items_padding_top">4dp</dimen>
+    <dimen name="qs_detail_item_icon_size">24dp</dimen>
+    <dimen name="qs_detail_item_icon_marginStart">0dp</dimen>
+    <dimen name="qs_detail_item_icon_marginEnd">20dp</dimen>
+
+    <!-- Desired qs icon overlay size. -->
+    <dimen name="qs_detail_icon_overlay_size">24dp</dimen>
 
     <dimen name="segmented_button_spacing">0dp</dimen>
     <dimen name="borderless_button_radius">2dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
index 2dd4a0ab76eb3..dad8bead40929 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItems.java
@@ -42,6 +42,7 @@ public class QSDetailItems extends FrameLayout {
     private static final String TAG = "QSDetailItems";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
+    private final int mQsDetailIconOverlaySize;
     private final Context mContext;
     private final H mHandler = new H();
     private final Adapter mAdapter = new Adapter();
@@ -60,6 +61,8 @@ public class QSDetailItems extends FrameLayout {
         super(context, attrs);
         mContext = context;
         mTag = TAG;
+        mQsDetailIconOverlaySize = (int) getResources().getDimension(
+                R.dimen.qs_detail_icon_overlay_size);
     }
 
     public static QSDetailItems convertOrInflate(Context context, View convert, ViewGroup parent) {
@@ -182,8 +185,7 @@ public class QSDetailItems extends FrameLayout {
             iv.setImageResource(item.icon);
             iv.getOverlay().clear();
             if (item.overlay != null) {
-                item.overlay.setBounds(0, 0, item.overlay.getIntrinsicWidth(),
-                        item.overlay.getIntrinsicHeight());
+                item.overlay.setBounds(0, 0, mQsDetailIconOverlaySize, mQsDetailIconOverlaySize);
                 iv.getOverlay().add(item.overlay);
             }
             final TextView title = (TextView) view.findViewById(android.R.id.title);