diff options
| author | Tony Wickham <twickham@google.com> | 2017-09-06 21:17:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-06 21:17:29 +0000 |
| commit | 9fad935b0396b73b47f71ebc9f98dfe7b3f3ebc0 (patch) | |
| tree | 0f000e5453c2ac22748531187eb927f7e607ee9f /res | |
| parent | f7db42f5ab79da8e0b0e91418399a93b79e28327 (diff) | |
| parent | 2063ebd990fdbea3f273a5c4fef3b739852c51c5 (diff) | |
| download | android_packages_apps_Trebuchet-9fad935b0396b73b47f71ebc9f98dfe7b3f3ebc0.tar.gz android_packages_apps_Trebuchet-9fad935b0396b73b47f71ebc9f98dfe7b3f3ebc0.tar.bz2 android_packages_apps_Trebuchet-9fad935b0396b73b47f71ebc9f98dfe7b3f3ebc0.zip | |
Merge "Adjust notification paddings" into ub-launcher3-dorval-polish2
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/notification.xml | 4 | ||||
| -rw-r--r-- | res/layout/notification_main.xml | 4 | ||||
| -rw-r--r-- | res/values/dimens.xml | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/res/layout/notification.xml b/res/layout/notification.xml index 4a02aa169..1eebb434b 100644 --- a/res/layout/notification.xml +++ b/res/layout/notification.xml @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" - android:gravity="bottom" + android:gravity="center_vertical" android:text="@string/notifications_header" android:textSize="@dimen/notification_header_text_size" android:textColor="?android:attr/textColorPrimary" /> @@ -58,7 +58,7 @@ android:layout_width="@dimen/notification_icon_size" android:layout_height="match_parent" android:layout_gravity="end" - android:gravity="bottom|center_horizontal" + android:gravity="center" android:textSize="@dimen/notification_header_count_text_size" android:fontFamily="sans-serif-medium" android:textColor="?android:attr/textColorPrimary" /> diff --git a/res/layout/notification_main.xml b/res/layout/notification_main.xml index f681e8b06..f94face1b 100644 --- a/res/layout/notification_main.xml +++ b/res/layout/notification_main.xml @@ -31,7 +31,7 @@ android:background="?attr/popupColorPrimary" android:paddingStart="@dimen/notification_padding_start" android:paddingEnd="@dimen/notification_main_text_padding_end" - android:paddingBottom="16dp"> + android:paddingBottom="14dp"> <TextView android:id="@+id/title" android:layout_width="match_parent" @@ -59,7 +59,7 @@ android:layout_width="@dimen/notification_icon_size" android:layout_height="@dimen/notification_icon_size" android:layout_marginEnd="@dimen/notification_padding_end" - android:layout_marginBottom="8dp" + android:layout_marginBottom="7dp" android:layout_gravity="center_vertical|end" /> </com.android.launcher3.notification.NotificationMainView> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3f6efd794..b1f9d6379 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -214,9 +214,11 @@ <dimen name="notification_padding_end">12dp</dimen> <!-- notification_padding_end + (icon_size - footer_icon_size) / 2 --> <dimen name="notification_footer_icon_row_padding">15dp</dimen> - <dimen name="notification_header_height">32dp</dimen> - <dimen name="notification_main_height">96dp</dimen> + <dimen name="notification_header_height">36dp</dimen> + <dimen name="notification_main_height">84dp</dimen> <dimen name="notification_footer_height">32dp</dimen> + <!-- How much space to keep as padding for the last notification when the footer collapses --> + <dimen name="notification_empty_footer_height">6dp</dimen> <dimen name="notification_header_text_size">13sp</dimen> <dimen name="notification_header_count_text_size">12sp</dimen> <dimen name="notification_main_title_size">16sp</dimen> |