Merge "clean up layout & styling of notification history" into rvc-dev (edca211a) · Commits · e / os / android_packages_apps_Settings

res/layout/notification_history.xml

+6 −7

Original line number	Diff line number	Diff line
		@@ -136,12 +136,12 @@
		android:layout_width="wrap_content"
		android:text="@string/notification_history_snooze"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@style/TextAppearance.HomepageCardTitle"
		android:paddingBottom="16dp" />

		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/notification_list"
		android:elevation="3dp"
		android:elevation="1dp"
		android:background="@drawable/rounded_bg"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -161,11 +161,11 @@
		android:layout_width="wrap_content"
		android:text="@string/notification_history_dismiss"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@style/TextAppearance.HomepageCardTitle"
		android:paddingBottom="16dp" />
		<androidx.recyclerview.widget.RecyclerView
		android:id="@+id/notification_list"
		android:elevation="3dp"
		android:elevation="1dp"
		android:background="@drawable/rounded_bg"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -183,19 +183,18 @@
		android:layout_width="wrap_content"
		android:text="@string/notification_history_today"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textAppearance="@style/TextAppearance.HomepageCardTitle"
		android:paddingBottom="16dp" />
		<LinearLayout
		android:id="@+id/apps"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:elevation="3dp"
		android:elevation="1dp"
		android:orientation="vertical"
		android:background="@drawable/rounded_bg">
		<!-- app based recycler views added here -->
		</LinearLayout>
		</LinearLayout>
		</LinearLayout>

		</LinearLayout>
		</androidx.core.widget.NestedScrollView>
		No newline at end of file

res/layout/notification_history_app_layout.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:clipChildren="true"
		android:clipToPadding="true"
		android:importantForAccessibility="yes"
		android:scrollbars="none"/>

res/layout/notification_history_log_row.xml

+7 −6

Original line number	Diff line number	Diff line
		@@ -17,12 +17,13 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="48dp"
		android:paddingBottom="6dp"
		android:paddingTop="6dp"
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:orientation="vertical"
		android:background="?android:attr/selectableItemBackground">
		android:background="?android:attr/colorBackgroundFloating"
		android:foreground="?android:attr/selectableItemBackground">

		<LinearLayout
		android:layout_width="match_parent"
		@@ -38,7 +39,7 @@
		android:layout_centerVertical="true"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
		android:textAppearance="@style/TextAppearance.NotificationHistory.Title"
		android:layout_toStartOf="@id/alerted_icon"
		android:textAlignment="viewStart"/>

		@@ -64,7 +65,7 @@
		android:layout_centerVertical="true"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
		android:textAppearance="@style/TextAppearance.NotificationHistory.AppName"
		android:textAlignment="viewEnd"
		/>
		</LinearLayout>
		@@ -77,7 +78,7 @@
		android:ellipsize="end"
		android:singleLine="true"
		android:paddingTop="3dp"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
		android:textAppearance="@style/TextAppearance.NotificationHistory.Text"
		android:textAlignment="viewStart" />

		</LinearLayout>

res/layout/notification_sbn_log_row.xml

+9 −13

Original line number	Diff line number	Diff line
		@@ -16,18 +16,17 @@
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="6dp"
		android:minHeight="48dp"
		android:orientation="vertical"
		android:background="?android:attr/selectableItemBackground"
		>
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:background="?android:attr/selectableItemBackground">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:orientation="vertical"
		>
		android:paddingTop="16dp"
		android:paddingBottom="16dp"
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="match_parent"
		@@ -56,10 +55,9 @@
		android:ellipsize="end"
		android:singleLine="true"
		android:textColor="?android:attr/textColorPrimary"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAppearance="@style/TextAppearance.NotificationHistory.AppName"
		android:marqueeRepeatLimit = "marquee_forever"
		android:scrollHorizontally = "true"
		android:textStyle="bold"
		android:textAlignment="viewStart" />

		<ImageView
		@@ -98,7 +96,7 @@
		android:layout_centerVertical="true"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
		android:textAppearance="@style/TextAppearance.NotificationHistory.AppName"
		android:textAlignment="viewEnd"
		/>
		</LinearLayout>
		@@ -107,7 +105,6 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:layout_marginStart="30dp"
		android:layout_marginBottom="6dp"
		>

		@@ -118,7 +115,7 @@
		android:layout_gravity="left\|center_vertical"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
		android:textAppearance="@style/TextAppearance.NotificationHistory.Title"
		android:textAlignment="viewStart"
		/>

		@@ -129,7 +126,7 @@
		android:layout_gravity="left\|center_vertical"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
		android:textAppearance="@style/TextAppearance.NotificationHistory.Text"
		android:textAlignment="viewStart"
		/>

		@@ -140,6 +137,5 @@
		android:id="@+id/divider"
		android:layout_width="match_parent"
		android:layout_height="0.5dp"
		android:layout_marginTop="17dp"
		android:background="@color/material_grey_300" />
		</LinearLayout>
		No newline at end of file

res/values/styles.xml

+18 −0

Original line number	Diff line number	Diff line
		@@ -334,6 +334,24 @@
		<item name="android:padding">8dp</item>
		</style>

		<style name="TextAppearance.NotificationHistory">
		<item name="android:textSize">14sp</item>
		</style>

		<style name="TextAppearance.NotificationHistory.AppName">
		<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
		<item name="android:textSize">12sp</item>
		</style>

		<style name="TextAppearance.NotificationHistory.Title">
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		</style>

		<style name="TextAppearance.NotificationHistory.Text">
		<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		</style>

		<style name="TextAppearance.ContextualCardDismissalText"
		parent="@*android:style/TextAppearance.DeviceDefault.Body1">
		<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>