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

[Notif] Update guts/blocking helper UI

Browse Source 
Polishing UI based on UX phase 3.

Updated font style, spacing, header alignment, button tap target (8dp
onsides, 14dp on top/bottom for 48dp touch target).

Double checked that other views that share in the button tap
targets/styles weren't affected negatively.

Test: visually
Bug: 77318740
Change-Id: I71cd0187b6d9d6cce62e0051af84922594bc5a9a
This commit is contained in:
Rohan Shah
2018-04-30 13:50:13 -07:00
parent 032ab15256
commit 75bb1284c2
5 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/app_ops_info.xml
View File

@@ -21,6 +21,8 @@
android:layout_height="wrap_content"
android:id="@+id/app_ops_info"
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"
@@ -63,10 +65,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/notification_guts_button_spacing"
android:layout_marginBottom="@dimen/notification_guts_button_spacing"
android:gravity="end" >
android:gravity="end"
android:orientation="horizontal">
<TextView
android:id="@+id/settings"

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

@@ -17,10 +17,12 @@
<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:id="@+id/notification_guts"
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"
@@ -33,8 +35,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_marginTop="2dp" >
android:clipToPadding="false">
<ImageView
android:id="@+id/pkgicon"
android:layout_width="@dimen/notification_guts_header_height"
@@ -74,16 +75,16 @@
android:layout_toEndOf="@id/pkg_group_divider" />
<ImageButton
android:id="@+id/info"
android:src="@drawable/ic_info"
android:tint="?android:attr/colorAccent"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="12dp"
android:layout_marginEnd="-12dp"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:contentDescription="@string/notification_more_settings"
android:layout_marginEnd="-16dp"
android:background="@drawable/ripple_drawable"
android:layout_alignParentEnd="true" />
android:contentDescription="@string/notification_more_settings"
android:padding="16dp"
android:src="@drawable/ic_info"
android:tint="?android:attr/colorAccent" />
</RelativeLayout>
<LinearLayout
@@ -91,7 +92,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/notification_guts_button_spacing"
android:layout_marginTop="@*android:dimen/notification_header_padding_top"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
<!-- Channel Info Block -->
@@ -105,14 +107,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="6dp"
style="@style/TextAppearance.NotificationInfo.Primary" />
style="@android:style/TextAppearance.Material.Notification.Title" />
<!-- Question prompt -->
<TextView
android:id="@+id/block_prompt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.NotificationInfo.Secondary" />
style="@android:style/TextAppearance.Material.Notification" />
</LinearLayout>
<!-- Settings and Done buttons -->
@@ -139,12 +140,14 @@
android:text="@string/inline_stop_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"
style="@style/TextAppearance.NotificationInfo.Button"/>
<TextView
android:id="@+id/minimize"
android:text="@string/inline_minimize_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"
style="@style/TextAppearance.NotificationInfo.Button" />
<TextView
android:id="@+id/keep"
@@ -152,6 +155,7 @@
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>
</LinearLayout>
@@ -160,22 +164,24 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/notification_guts_button_spacing"
android:layout_marginTop="@*android:dimen/notification_header_padding_top"
android:layout_marginTop="@dimen/notification_guts_button_spacing"
android:visibility="gone"
android:orientation="horizontal" >
<TextView
android:id="@+id/confirmation_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="@string/notification_channel_disabled"
style="@style/TextAppearance.NotificationInfo.Confirmation"/>
<TextView
android:id="@+id/undo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/inline_undo"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="-8dp"
android:text="@string/inline_undo"
style="@style/TextAppearance.NotificationInfo.Button"/>
</RelativeLayout>
</com.android.systemui.statusbar.NotificationInfo>

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

@@ -95,7 +95,7 @@
<color name="notification_gear_color">#ff757575</color>
<!-- The "inside" of a notification, reached via longpress -->
<color name="notification_guts_bg_color">#eeeeee</color>
<color name="notification_guts_bg_color">#f8f9fa</color>
<color name="assist_orb_color">#ffffff</color>

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

@@ -155,8 +155,17 @@
<!-- The space around a notification menu item -->
<dimen name="notification_menu_icon_padding">20dp</dimen>
<!-- The veritical space around the buttons in the inline settings -->
<dimen name="notification_guts_button_spacing">20dp</dimen>
<!-- The vertical space around the buttons in the inline settings -->
<dimen name="notification_guts_button_spacing">6dp</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>
<!-- The horizontal space around the buttons in the inline settings -->
<dimen name="notification_guts_button_horizontal_spacing">8dp</dimen>
<!-- The height of the header in inline settings -->
<dimen name="notification_guts_header_height">24dp</dimen>

6
packages/SystemUI/res/values/styles.xml
View File

@@ -486,8 +486,10 @@
<item name="android:background">@drawable/btn_borderless_rect</item>
<item name="android:gravity">center</item>
<item name="android:focusable">true</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>
<item name="android:paddingTop">@dimen/notification_guts_button_vertical_padding</item>
<item name="android:paddingBottom">@dimen/notification_guts_button_vertical_padding</item>
<item name="android:paddingLeft">@dimen/notification_guts_button_horizontal_padding</item>
<item name="android:paddingRight">@dimen/notification_guts_button_horizontal_padding</item>
</style>
<style name="TextAppearance.HeadsUpStatusBarText"