summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2016-04-14 23:57:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-04-14 23:57:06 +0000
commit9a5a6ebcda618c72d80f11370e27375cffb62efa (patch)
tree357c33447c5b263f9f95e88386a3f00464e0530d
parent117cff790e34948e847d724be624ed2dd00bc82c (diff)
parentcc715a5b50ed5db2a553c81fcc242fa5a19daaa4 (diff)
Merge "Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5" into nyc-dev
-rw-r--r--core/res/res/layout/notification_template_right_icon.xml4
-rw-r--r--core/res/res/values/dimens.xml4
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 b652127e85bd..65a5015f8094 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 9178305159b9..8200df875432 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>