From cc715a5b50ed5db2a553c81fcc242fa5a19daaa4 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Thu, 14 Apr 2016 16:44:48 -0700
Subject: [PATCH] Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5

Some apps still rely on notification_large_icon_width
and notification_large_icon_height to be 48dp in their
custom views. Temporarily revert change to 40dp until
apps are fixed.

Bug: 28161359
Change-Id: Ie476943af93de457e1635c168067e85dad7df315
---
 core/res/res/layout/notification_template_right_icon.xml | 4 ++--
 core/res/res/values/dimens.xml                           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/res/res/layout/notification_template_right_icon.xml b/core/res/res/layout/notification_template_right_icon.xml
index b652127e85bdc..65a5015f8094c 100644
--- a/core/res/res/layout/notification_template_right_icon.xml
+++ b/core/res/res/layout/notification_template_right_icon.xml
@@ -16,8 +16,8 @@
   -->
 
 <ImageView android:id="@+id/right_icon" xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/notification_large_icon_width"
-    android:layout_height="@dimen/notification_large_icon_width"
+    android:layout_width="40dp"
+    android:layout_height="40dp"
     android:layout_marginEnd="@dimen/notification_content_margin_end"
     android:layout_marginTop="36dp"
     android:layout_gravity="top|end"
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 9178305159b93..8200df875432f 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -162,9 +162,9 @@
     <dimen name="notification_min_height">92dp</dimen>
 
     <!-- The width of the big icons in notifications. -->
-    <dimen name="notification_large_icon_width">40dp</dimen>
+    <dimen name="notification_large_icon_width">64dp</dimen>
     <!-- The width of the big icons in notifications. -->
-    <dimen name="notification_large_icon_height">40dp</dimen>
+    <dimen name="notification_large_icon_height">64dp</dimen>
 
     <!-- The minimum width of the app name in the header if it shrinks -->
     <dimen name="notification_header_shrink_min_width">72dp</dimen>