diff options
13 files changed, 26 insertions, 26 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index b0d2e7746f48..626d5f93b115 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4206,7 +4206,8 @@ public class Notification implements Parcelable int i=0; final float density = mBuilder.mContext.getResources().getDisplayMetrics().density; int topPadding = (int) (5 * density); - int bottomPadding = (int) (13 * density); + int bottomPadding = mBuilder.mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.notification_content_margin_bottom); boolean first = true; while (i < mTexts.size() && i < rowIds.length) { CharSequence str = mTexts.get(i); diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml index b8b00bfcc111..0bbaa24a9ad4 100644 --- a/core/res/res/layout/notification_template_header.xml +++ b/core/res/res/layout/notification_template_header.xml @@ -20,9 +20,9 @@ android:id="@+id/notification_header" android:orientation="horizontal" android:layout_width="wrap_content" - android:layout_height="48dp" + android:layout_height="53dp" android:clipChildren="false" - android:paddingTop="5dp" + android:paddingTop="10dp" android:paddingBottom="16dp" android:paddingStart="@dimen/notification_content_margin_start" android:paddingEnd="16dp"> diff --git a/core/res/res/layout/notification_template_material_base.xml b/core/res/res/layout/notification_template_material_base.xml index a37bfa9afc00..ccd26fb22cb0 100644 --- a/core/res/res/layout/notification_template_material_base.xml +++ b/core/res/res/layout/notification_template_material_base.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginStart="@dimen/notification_content_margin_start" - android:layout_marginBottom="11dp" + android:layout_marginBottom="15dp" android:layout_marginEnd="@dimen/notification_content_margin_end" > <include layout="@layout/notification_template_progress" /> </FrameLayout> diff --git a/core/res/res/layout/notification_template_material_big_base.xml b/core/res/res/layout/notification_template_material_big_base.xml index f302087ec398..d53fb5f2e177 100644 --- a/core/res/res/layout/notification_template_material_big_base.xml +++ b/core/res/res/layout/notification_template_material_big_base.xml @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginStart="@dimen/notification_content_margin_start" - android:layout_marginBottom="11dp" + android:layout_marginBottom="15dp" android:layout_marginEnd="@dimen/notification_content_margin_end"> <include layout="@layout/notification_template_progress" /> </FrameLayout> diff --git a/core/res/res/layout/notification_template_material_big_media.xml b/core/res/res/layout/notification_template_material_big_media.xml index a5ed1875d830..04ea12d4f9fe 100644 --- a/core/res/res/layout/notification_template_material_big_media.xml +++ b/core/res/res/layout/notification_template_material_big_media.xml @@ -25,7 +25,7 @@ > <include layout="@layout/notification_template_header" android:layout_width="match_parent" - android:layout_height="48dp" + android:layout_height="53dp" android:layout_gravity="start"/> <LinearLayout android:layout_width="match_parent" @@ -50,9 +50,10 @@ android:id="@+id/media_actions" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="-15dp" + android:layout_marginTop="-21dp" android:paddingStart="8dp" - android:paddingBottom="8dp" + android:paddingBottom="12dp" + android:gravity="top" android:orientation="horizontal" android:layoutDirection="ltr" > @@ -65,7 +66,7 @@ android:layout_height="@dimen/media_notification_expanded_image_max_size" android:minWidth="40dp" android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" + android:layout_marginBottom="20dp" android:layout_gravity="bottom|end" android:scaleType="centerCrop" /> diff --git a/core/res/res/layout/notification_template_material_big_text.xml b/core/res/res/layout/notification_template_material_big_text.xml index 3c59b4e83a05..fdfefe10c3b5 100644 --- a/core/res/res/layout/notification_template_material_big_text.xml +++ b/core/res/res/layout/notification_template_material_big_text.xml @@ -39,7 +39,7 @@ <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginTop="1dp" + android:layout_marginTop="0.5dp" android:paddingBottom="@dimen/notification_content_margin_bottom" android:textAppearance="@style/TextAppearance.Material.Notification" android:singleLine="false" diff --git a/core/res/res/layout/notification_template_material_media.xml b/core/res/res/layout/notification_template_material_media.xml index cda063627dc5..809e525efb52 100644 --- a/core/res/res/layout/notification_template_material_media.xml +++ b/core/res/res/layout/notification_template_material_media.xml @@ -24,7 +24,7 @@ > <include layout="@layout/notification_template_header" android:layout_width="fill_parent" - android:layout_height="48dp" /> + android:layout_height="53dp" /> <LinearLayout android:id="@+id/notification_main_column" android:layout_width="match_parent" @@ -54,7 +54,7 @@ android:layout_height="match_parent" android:layout_gravity="bottom|end" android:layout_marginStart="10dp" - android:layout_marginBottom="8dp" + android:layout_marginBottom="12dp" android:layoutDirection="ltr" android:orientation="horizontal" > diff --git a/core/res/res/layout/notification_template_right_icon.xml b/core/res/res/layout/notification_template_right_icon.xml index 3b358ab01a96..15ccc6729792 100644 --- a/core/res/res/layout/notification_template_right_icon.xml +++ b/core/res/res/layout/notification_template_right_icon.xml @@ -19,7 +19,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_marginEnd="16dp" - android:layout_marginTop="32dp" + android:layout_marginTop="36dp" android:layout_gravity="top|end" android:scaleType="centerCrop" /> diff --git a/core/res/res/layout/notification_template_text.xml b/core/res/res/layout/notification_template_text.xml index 47b30ec99299..a318bda3bbfa 100644 --- a/core/res/res/layout/notification_template_text.xml +++ b/core/res/res/layout/notification_template_text.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:layout_marginTop="1dp" + android:layout_marginTop="0.5dp" android:ellipsize="marquee" android:fadingEdge="horizontal" android:gravity="top" diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 152473afe077..081d6135c680 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -151,16 +151,13 @@ <dimen name="notification_content_picture_margin">56dp</dimen> <!-- height of the content margin to accomodate for the header --> - <dimen name="notification_content_margin_top">30dp</dimen> + <dimen name="notification_content_margin_top">37.5dp</dimen> <!-- height of the content margin on the bottom --> - <dimen name="notification_content_margin_bottom">13dp</dimen> - - <!-- height of notification header view if present --> - <dimen name="notification_header_height">32dp</dimen> + <dimen name="notification_content_margin_bottom">16dp</dimen> <!-- Height of a small notification in the status bar --> - <dimen name="notification_min_height">84dp</dimen> + <dimen name="notification_min_height">92dp</dimen> <!-- The width of the big icons in notifications. --> <dimen name="notification_large_icon_width">64dp</dimen> @@ -177,7 +174,7 @@ <dimen name="media_notification_expanded_image_max_size">94dp</dimen> <!-- The maximum size of the image in the expanded media notification --> - <dimen name="media_notification_expanded_image_margin_bottom">16dp</dimen> + <dimen name="media_notification_expanded_image_margin_bottom">20dp</dimen> <!-- The margin of the content to an image--> <dimen name="notification_content_image_margin_end">8dp</dimen> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 82db435bce77..d46997244ddf 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2420,13 +2420,13 @@ <java-symbol type="drawable" name="ic_collapse_notification" /> <java-symbol type="drawable" name="ic_expand_bundle" /> <java-symbol type="drawable" name="ic_collapse_bundle" /> - <java-symbol type="dimen" name="notification_header_height" /> <java-symbol type="dimen" name="notification_min_content_height" /> <java-symbol type="dimen" name="notification_header_shrink_min_width" /> <java-symbol type="dimen" name="notification_content_margin_start" /> <java-symbol type="dimen" name="notification_content_margin_end" /> <java-symbol type="dimen" name="notification_content_picture_margin" /> <java-symbol type="dimen" name="notification_content_margin_top" /> + <java-symbol type="dimen" name="notification_content_margin_bottom" /> <java-symbol type="string" name="importance_from_user" /> <java-symbol type="string" name="importance_from_person" /> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 8a7f90bf4a14..3ca0f7a2692d 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -58,19 +58,19 @@ <item name="status_bar_icon_scale_factor" format="float" type="dimen">1.0</item> <!-- Height of a small notification in the status bar--> - <dimen name="notification_min_height">86dp</dimen> + <dimen name="notification_min_height">92dp</dimen> <!-- Height of a small notification in the status bar which was used before android N --> <dimen name="notification_min_height_legacy">64dp</dimen> <!-- Height of a large notification in the status bar --> - <dimen name="notification_max_height">276dp</dimen> + <dimen name="notification_max_height">284dp</dimen> <!-- Height of a heads up notification in the status bar for legacy custom views --> <dimen name="notification_max_heads_up_height_legacy">128dp</dimen> <!-- Height of a heads up notification in the status bar --> - <dimen name="notification_max_heads_up_height">141dp</dimen> + <dimen name="notification_max_heads_up_height">148dp</dimen> <!-- Height of a the summary ("more card") notification on keyguard. --> <dimen name="notification_summary_height">44dp</dimen> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index 9d50ab44ffa6..676ff2ebc258 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java @@ -96,7 +96,8 @@ public class NotificationChildrenContainer extends ViewGroup { com.android.internal.R.dimen.notification_content_margin_top); mNotificatonTopPadding = getResources().getDimensionPixelSize( R.dimen.notification_children_container_top_padding); - mCollapsedBottompadding = 11.5f * getResources().getDisplayMetrics().density; + mCollapsedBottompadding = getResources().getDimensionPixelSize( + com.android.internal.R.dimen.notification_content_margin_bottom); } @Override |