From a032c90189d9ac28b65af4fe5f8b34f182441335 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Sun, 16 Jan 2011 10:50:23 -0800
Subject: [PATCH] Provide a public resource with the dimensions of the large
 notification icon.

Bug: 3301067
Change-Id: I4ef66ee35df34a5288681a0e80e9877d57398dd0
---
 api/current.xml                               | 22 +++++++++++++++++++
 core/res/res/values/dimens.xml                |  6 +++++
 core/res/res/values/public.xml                |  2 ++
 .../status_bar_notification_row.xml           |  4 ++--
 .../status_bar_ticker_compat.xml              |  4 ++--
 .../layout-xlarge/status_bar_ticker_panel.xml |  4 ++--
 .../SystemUI/res/values-xlarge/dimens.xml     |  4 ----
 .../statusbar/tablet/TabletTicker.java        |  3 ++-
 8 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 68d3187dce0a2..5866d1fbcf33a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -11473,6 +11473,28 @@
  visibility="public"
 >
 </field>
+<field name="notification_large_icon_height"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="17104902"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="notification_large_icon_width"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="17104901"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="thumbnail_height"
  type="int"
  transient="false"
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index e5b6563bcf060..a51a26d715798 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -68,4 +68,10 @@
          is along the minor axis (that is the screen is portrait).  This may
          be either a fraction or a dimension. -->
     <item type="dimen" name="dialog_min_width_minor">95%</item>
+
+    <!-- The width of the big icons in notifications. -->
+    <dimen name="notification_large_icon_width">60dp</dimen>
+    <!-- The width of the big icons in notifications. -->
+    <dimen name="notification_large_icon_height">60dp</dimen>
+
 </resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e73486defea80..a8fc4f334ba4c 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1470,6 +1470,8 @@
 
   <public type="dimen" name="dialog_min_width_major" />
   <public type="dimen" name="dialog_min_width_minor" />
+  <public type="dimen" name="notification_large_icon_width" />
+  <public type="dimen" name="notification_large_icon_height" />
 
   <!-- Standard content view for a {@link android.app.ListFragment}.
        If you are implementing a subclass of ListFragment with your
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_notification_row.xml b/packages/SystemUI/res/layout-xlarge/status_bar_notification_row.xml
index 4991a406efacb..e97345b1dc727 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_notification_row.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_notification_row.xml
@@ -18,8 +18,8 @@
 
     <ImageView
         android:id="@+id/large_icon"
-        android:layout_width="@dimen/notification_large_icon_width"
-        android:layout_height="@dimen/notification_large_icon_height"
+        android:layout_width="@android:dimen/notification_large_icon_width"
+        android:layout_height="@android:dimen/notification_large_icon_height"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:scaleType="center"
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_ticker_compat.xml b/packages/SystemUI/res/layout-xlarge/status_bar_ticker_compat.xml
index 5d9a680c9c47d..6de76977aea06 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_ticker_compat.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_ticker_compat.xml
@@ -25,8 +25,8 @@
 
     <ImageView
         android:id="@+id/large_icon"
-        android:layout_width="@dimen/notification_large_icon_width"
-        android:layout_height="@dimen/notification_large_icon_height"
+        android:layout_width="@android:dimen/notification_large_icon_width"
+        android:layout_height="@android:dimen/notification_large_icon_height"
         android:scaleType="center"
         android:visibility="gone"
         />
diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_ticker_panel.xml b/packages/SystemUI/res/layout-xlarge/status_bar_ticker_panel.xml
index cae6a7790c218..d570acec10c60 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_ticker_panel.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_ticker_panel.xml
@@ -29,8 +29,8 @@
 
     <ImageView
         android:id="@+id/large_icon"
-        android:layout_width="@dimen/notification_large_icon_height"
-        android:layout_height="@dimen/notification_large_icon_width"
+        android:layout_width="@android:dimen/notification_large_icon_height"
+        android:layout_height="@android:dimen/notification_large_icon_width"
         android:scaleType="center"
         android:visibility="gone"
         />
diff --git a/packages/SystemUI/res/values-xlarge/dimens.xml b/packages/SystemUI/res/values-xlarge/dimens.xml
index b9f5837d3cf53..9d89e21761ab6 100644
--- a/packages/SystemUI/res/values-xlarge/dimens.xml
+++ b/packages/SystemUI/res/values-xlarge/dimens.xml
@@ -16,10 +16,6 @@
 */
 -->
 <resources>
-    <!-- The width of the big icons in notifications. -->
-    <dimen name="notification_large_icon_width">60dp</dimen>
-    <!-- The width of the big icons in notifications. -->
-    <dimen name="notification_large_icon_height">60dp</dimen>
     <!-- The width of the ticker, including the icon -->
     <dimen name="notification_ticker_width">360dp</dimen>
     <!-- Status bar panel bottom offset (height of status bar - overlap) -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java
index 7705dfc38694b..fa732c3224855 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java
@@ -208,7 +208,8 @@ public class TabletTicker
         final Resources res = mContext.getResources();
         final FrameLayout view = new FrameLayout(mContext);
         final int width = res.getDimensionPixelSize(R.dimen.notification_ticker_width);
-        final int height = res.getDimensionPixelSize(R.dimen.notification_large_icon_height);
+        final int height = res.getDimensionPixelSize(
+                android.R.dimen.notification_large_icon_height);
         int windowFlags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
                     | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
                     | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;