Merge "[Notif] Update guts/blocking helper UI" into pi-dev (33b57e84) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/app_ops_info.xml

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,8 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:id="@+id/app_ops_info"		android:id="@+id/app_ops_info"
	android:clickable="true"		android:clickable="true"
			android:clipChildren="false"
			android:clipToPadding="false"
	android:orientation="vertical"		android:orientation="vertical"
	android:paddingStart="@*android:dimen/notification_content_margin_start"		android:paddingStart="@*android:dimen/notification_content_margin_start"
	android:paddingEnd="@*android:dimen/notification_content_margin_end"		android:paddingEnd="@*android:dimen/notification_content_margin_end"
	@@ -63,10 +65,10 @@
	<LinearLayout		<LinearLayout
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:orientation="horizontal"
	android:layout_marginTop="@dimen/notification_guts_button_spacing"		android:layout_marginTop="@dimen/notification_guts_button_spacing"
	android:layout_marginBottom="@dimen/notification_guts_button_spacing"		android:layout_marginBottom="@dimen/notification_guts_button_spacing"
	android:gravity="end" >		android:gravity="end"
			android:orientation="horizontal">

	<TextView		<TextView
	android:id="@+id/settings"		android:id="@+id/settings"

packages/SystemUI/res/layout/notification_info.xml

+23 −17

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,12 @@

	<com.android.systemui.statusbar.NotificationInfo		<com.android.systemui.statusbar.NotificationInfo
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
			android:id="@+id/notification_guts"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:id="@+id/notification_guts"
	android:clickable="true"		android:clickable="true"
			android:clipChildren="false"
			android:clipToPadding="false"
	android:orientation="vertical"		android:orientation="vertical"
	android:paddingStart="@*android:dimen/notification_content_margin_start"		android:paddingStart="@*android:dimen/notification_content_margin_start"
	android:paddingEnd="@*android:dimen/notification_content_margin_end"		android:paddingEnd="@*android:dimen/notification_content_margin_end"
	@@ -33,8 +35,7 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:clipChildren="false"		android:clipChildren="false"
	android:clipToPadding="false"		android:clipToPadding="false">
	android:layout_marginTop="2dp" >
	<ImageView		<ImageView
	android:id="@+id/pkgicon"		android:id="@+id/pkgicon"
	android:layout_width="@dimen/notification_guts_header_height"		android:layout_width="@dimen/notification_guts_header_height"
	@@ -74,16 +75,16 @@
	android:layout_toEndOf="@id/pkg_group_divider" />		android:layout_toEndOf="@id/pkg_group_divider" />
	<ImageButton		<ImageButton
	android:id="@+id/info"		android:id="@+id/info"
	android:src="@drawable/ic_info"		android:layout_width="56dp"
	android:tint="?android:attr/colorAccent"		android:layout_height="56dp"
	android:layout_width="48dp"		android:layout_alignParentEnd="true"
	android:layout_height="48dp"
	android:padding="12dp"
	android:layout_marginEnd="-12dp"
	android:layout_centerVertical="true"		android:layout_centerVertical="true"
	android:contentDescription="@string/notification_more_settings"		android:layout_marginEnd="-16dp"
	android:background="@drawable/ripple_drawable"		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>		</RelativeLayout>

	<LinearLayout		<LinearLayout
	@@ -91,7 +92,8 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_marginBottom="@dimen/notification_guts_button_spacing"		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">		android:orientation="vertical">

	<!-- Channel Info Block -->		<!-- Channel Info Block -->
	@@ -105,14 +107,13 @@
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_weight="1"		android:layout_weight="1"
	android:layout_marginBottom="6dp"		style="@android:style/TextAppearance.Material.Notification.Title" />
	style="@style/TextAppearance.NotificationInfo.Primary" />
	<!-- Question prompt -->		<!-- Question prompt -->
	<TextView		<TextView
	android:id="@+id/block_prompt"		android:id="@+id/block_prompt"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	style="@style/TextAppearance.NotificationInfo.Secondary" />		style="@android:style/TextAppearance.Material.Notification" />
	</LinearLayout>		</LinearLayout>

	<!-- Settings and Done buttons -->		<!-- Settings and Done buttons -->
	@@ -139,12 +140,14 @@
	android:text="@string/inline_stop_button"		android:text="@string/inline_stop_button"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="match_parent"		android:layout_height="match_parent"
			android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"
	style="@style/TextAppearance.NotificationInfo.Button"/>		style="@style/TextAppearance.NotificationInfo.Button"/>
	<TextView		<TextView
	android:id="@+id/minimize"		android:id="@+id/minimize"
	android:text="@string/inline_minimize_button"		android:text="@string/inline_minimize_button"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="match_parent"		android:layout_height="match_parent"
			android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"
	style="@style/TextAppearance.NotificationInfo.Button" />		style="@style/TextAppearance.NotificationInfo.Button" />
	<TextView		<TextView
	android:id="@+id/keep"		android:id="@+id/keep"
	@@ -152,6 +155,7 @@
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="match_parent"		android:layout_height="match_parent"
	android:layout_marginEnd="-8dp"		android:layout_marginEnd="-8dp"
			android:layout_marginStart="@dimen/notification_guts_button_horizontal_spacing"
	style="@style/TextAppearance.NotificationInfo.Button"/>		style="@style/TextAppearance.NotificationInfo.Button"/>
	</LinearLayout>		</LinearLayout>
	</LinearLayout>		</LinearLayout>
	@@ -160,22 +164,24 @@
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_marginBottom="@dimen/notification_guts_button_spacing"		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:visibility="gone"
	android:orientation="horizontal" >		android:orientation="horizontal" >
	<TextView		<TextView
	android:id="@+id/confirmation_text"		android:id="@+id/confirmation_text"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
			android:layout_centerVertical="true"
	android:text="@string/notification_channel_disabled"		android:text="@string/notification_channel_disabled"
	style="@style/TextAppearance.NotificationInfo.Confirmation"/>		style="@style/TextAppearance.NotificationInfo.Confirmation"/>
	<TextView		<TextView
	android:id="@+id/undo"		android:id="@+id/undo"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:text="@string/inline_undo"
	android:layout_alignParentEnd="true"		android:layout_alignParentEnd="true"
			android:layout_centerVertical="true"
	android:layout_marginEnd="-8dp"		android:layout_marginEnd="-8dp"
			android:text="@string/inline_undo"
	style="@style/TextAppearance.NotificationInfo.Button"/>		style="@style/TextAppearance.NotificationInfo.Button"/>
	</RelativeLayout>		</RelativeLayout>
	</com.android.systemui.statusbar.NotificationInfo>		</com.android.systemui.statusbar.NotificationInfo>

packages/SystemUI/res/values/colors.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@
	<color name="notification_gear_color">#ff757575</color>		<color name="notification_gear_color">#ff757575</color>

	<!-- The "inside" of a notification, reached via longpress -->		<!-- 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>		<color name="assist_orb_color">#ffffff</color>

packages/SystemUI/res/values/dimens.xml

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -158,8 +158,17 @@
	<!-- The space around a notification menu item -->		<!-- The space around a notification menu item -->
	<dimen name="notification_menu_icon_padding">20dp</dimen>		<dimen name="notification_menu_icon_padding">20dp</dimen>

	<!-- The veritical space around the buttons in the inline settings -->		<!-- The vertical space around the buttons in the inline settings -->
	<dimen name="notification_guts_button_spacing">20dp</dimen>		<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 -->		<!-- The height of the header in inline settings -->
	<dimen name="notification_guts_header_height">24dp</dimen>		<dimen name="notification_guts_header_height">24dp</dimen>

packages/SystemUI/res/values/styles.xml

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -483,8 +483,10 @@
	<item name="android:background">@drawable/btn_borderless_rect</item>		<item name="android:background">@drawable/btn_borderless_rect</item>
	<item name="android:gravity">center</item>		<item name="android:gravity">center</item>
	<item name="android:focusable">true</item>		<item name="android:focusable">true</item>
	<item name="android:paddingStart">8dp</item>		<item name="android:paddingTop">@dimen/notification_guts_button_vertical_padding</item>
	<item name="android:paddingEnd">8dp</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>

	<style name="TextAppearance.HeadsUpStatusBarText"		<style name="TextAppearance.HeadsUpStatusBarText"