Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minimized notification height = 56dp" into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-02-24 04:01:26 +00:00
committed by Android (Google) Code Review
parent 1423ab74d3 b0441d79f1
commit 8e2599beaa
8 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/layout/notification_template_header.xml
View File

@@ -17,8 +17,8 @@
<NotificationHeaderView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/notification_header"
android:layout_width="wrap_content"
android:layout_height="@dimen/notification_header_solo_height"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_header_height"
android:layout_marginBottom="@dimen/notification_header_margin_bottom"
android:clipChildren="false"
android:gravity="center_vertical"

6
core/res/res/layout/notification_template_material_big_base.xml
View File

@@ -38,11 +38,7 @@
android:layout_gravity="top"
>
<include
layout="@layout/notification_template_header"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_header_big_height"
/>
<include layout="@layout/notification_template_header" />
<LinearLayout
android:id="@+id/notification_main_column"

1
core/res/res/layout/notification_template_material_big_media.xml
View File

@@ -36,7 +36,6 @@
layout="@layout/notification_template_header"
android:layout_width="match_parent"
android:layout_height="@dimen/media_notification_header_height"
android:layout_gravity="start"
/>
<LinearLayout

6
core/res/res/layout/notification_template_material_big_picture.xml
View File

@@ -23,11 +23,7 @@
android:clipChildren="false"
>
<include
layout="@layout/notification_template_header"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_header_big_height"
/>
<include layout="@layout/notification_template_header" />
<include layout="@layout/notification_template_right_icon" />

6
core/res/res/layout/notification_template_material_big_text.xml
View File

@@ -23,11 +23,7 @@
android:tag="bigText"
>
<include
layout="@layout/notification_template_header"
android:layout_width="match_parent"
android:layout_height="@dimen/notification_header_big_height"
/>
<include layout="@layout/notification_template_header" />
<com.android.internal.widget.RemeasuringLinearLayout
android:id="@+id/notification_action_list_margin_target"

3
core/res/res/layout/notification_template_material_media.xml
View File

@@ -32,7 +32,8 @@
/>
<include layout="@layout/notification_template_header"
android:layout_width="match_parent"
android:layout_height="@dimen/media_notification_header_height" />
android:layout_height="@dimen/media_notification_header_height"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

9
core/res/res/values/dimens.xml
View File

@@ -271,11 +271,8 @@
<!-- The top margin before the notification progress bar. -->
<dimen name="notification_progress_margin_top">8dp</dimen>
<!-- height of the notification header when the notification is alone (minimized / groups) -->
<dimen name="notification_header_solo_height">48dp</dimen>
<!-- height of the notification header when in a "big" layout -->
<dimen name="notification_header_big_height">56dp</dimen>
<!-- height of the notification header -->
<dimen name="notification_header_height">56dp</dimen>
<!-- The height of the background for a notification header on a group -->
<dimen name="notification_header_background_height">49.5dp</dimen>
@@ -365,7 +362,7 @@
<dimen name="media_notification_expanded_image_margin_bottom">20dp</dimen>
<!-- The absolute height for the header in a media notification. -->
<dimen name="media_notification_header_height">@dimen/notification_header_big_height</dimen>
<dimen name="media_notification_header_height">@dimen/notification_header_height</dimen>
<!-- The margin of the content to an image-->
<dimen name="notification_content_image_margin_end">8dp</dimen>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -651,7 +651,7 @@
</dimen>
<!-- The height of a notification header -->
<dimen name="notification_header_height">53dp</dimen>
<dimen name="notification_header_height">@*android:dimen/notification_header_height</dimen>
<!-- The height of the gap between adjacent notification sections. -->
<dimen name="notification_section_divider_height">@dimen/notification_side_paddings</dimen>