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

Merge "[Notif] Fix BH & Snooze button bounds and UI" into pi-dev am: c09a39d73c

Browse Source 
am: f0064ce09d

Change-Id: I8392f79628eb31d274a549fbc46b4d9683e1652d
This commit is contained in:
android-build-team Robot
2018-05-04 11:20:56 -07:00
committed by android-build-merger
parent 7c39b7af3c f0064ce09d
commit 26f1b66b81
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SystemUI/res/layout/notification_info.xml
View File

@@ -16,24 +16,23 @@
-->
<com.android.systemui.statusbar.NotificationInfo
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/notification_guts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingStart="@*android:dimen/notification_content_margin_start"
android:paddingEnd="@*android:dimen/notification_content_margin_end"
android:background="@color/notification_guts_bg_color"
android:theme="@*android:style/Theme.DeviceDefault.Light">
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/notification_guts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"
android:background="@color/notification_guts_bg_color"
android:theme="@*android:style/Theme.DeviceDefault.Light">
<!-- Package Info -->
<RelativeLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@*android:dimen/notification_content_margin_start"
android:clipChildren="false"
android:clipToPadding="false">
<ImageView
@@ -73,13 +72,13 @@
android:maxLines="1"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/pkg_group_divider" />
<!-- 24 dp icon with 16 dp padding all around to mirror notification content margins -->
<ImageButton
android:id="@+id/info"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="-16dp"
android:background="@drawable/ripple_drawable"
android:contentDescription="@string/notification_more_settings"
android:padding="16dp"
@@ -100,6 +99,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@*android:dimen/notification_content_margin_start"
android:layout_marginEnd="@*android:dimen/notification_content_margin_start"
android:orientation="vertical">
<!-- Channel Name -->
<TextView
@@ -120,9 +121,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/notification_guts_button_spacing"
android:gravity="end" >
android:layout_marginStart="@dimen/notification_guts_button_side_margin"
android:layout_marginEnd="@dimen/notification_guts_button_side_margin"
android:gravity="end"
android:orientation="horizontal">
<!-- Optional link to app. Only appears if the channel is not disabled and the app
asked for it -->
@@ -154,7 +157,6 @@
android:text="@string/inline_keep_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="-8dp"
android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"
style="@style/TextAppearance.NotificationInfo.Button"/>
</LinearLayout>
@@ -165,6 +167,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/notification_guts_button_spacing"
android:layout_marginTop="@dimen/notification_guts_button_spacing"
android:layout_marginStart="@dimen/notification_guts_button_side_margin"
android:layout_marginEnd="@dimen/notification_guts_button_side_margin"
android:visibility="gone"
android:orientation="horizontal" >
<TextView
@@ -180,7 +184,6 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="-8dp"
android:text="@string/inline_undo"
style="@style/TextAppearance.NotificationInfo.Button"/>
</RelativeLayout>

8
packages/SystemUI/res/layout/notification_snooze.xml
View File

@@ -50,13 +50,13 @@
<TextView
android:id="@+id/undo"
style="@style/TextAppearance.NotificationInfo.Button"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginEnd="@*android:dimen/notification_content_margin_end"
android:layout_height="48dp"
android:layout_marginEnd="@dimen/notification_guts_button_side_margin"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:text="@string/snooze_undo" />
android:text="@string/snooze_undo"
style="@style/TextAppearance.NotificationInfo.Button" />
</RelativeLayout>
<View

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

@@ -161,11 +161,14 @@
<!-- The vertical space around the buttons in the inline settings -->
<dimen name="notification_guts_button_spacing">6dp</dimen>
<!-- Extra horizontal space for properly aligning guts buttons with the notification content -->
<dimen name="notification_guts_button_side_margin">8dp</dimen>
<!-- The vertical padding a notification guts button has to fulfill the 48dp touch target -->
<dimen name="notification_guts_button_vertical_padding">14dp</dimen>
<!-- The horizontal padding for notification guts buttons-->
<dimen name="notification_guts_button_horizontal_padding">14dp</dimen>
<dimen name="notification_guts_button_horizontal_padding">8dp</dimen>
<!-- The horizontal space around the buttons in the inline settings -->
<dimen name="notification_guts_button_horizontal_spacing">8dp</dimen>