Merge "Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5" into nyc-dev

am: 9a5a6eb

* commit '9a5a6ebcda618c72d80f11370e27375cffb62efa':
  Partial revert of c1a80b08f0

Change-Id: Ib08281a5b5714c4d7f65782f7eb093cfc84e8345
This commit is contained in:
Adrian Roos
2016-04-15 00:04:56 +00:00
committed by android-build-merger
2 changed files with 4 additions and 4 deletions

View File

@@ -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"

View File

@@ -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>