Merge "Fix overlapping text in NotificationHistoryActivity" into tm-qpr-dev (9ba24436) · Commits · e / os / android_packages_apps_Settings

res/drawable/button_ripple_radius.xml

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<ripple
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:color="?android:attr/colorControlHighlight">
		<item android:id="@android:id/mask">
		<shape android:shape="rectangle">
		<solid android:color="@android:color/white" />
		<corners android:radius="@dimen/rect_button_radius" />
		</shape>
		</item>
		</ripple>
		No newline at end of file

res/layout/notification_history_app_layout.xml

+63 −47

Original line number	Diff line number	Diff line
		@@ -21,58 +21,74 @@
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<RelativeLayout
		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/app_header"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:clipChildren="true"
		android:background="@drawable/button_ripple_radius"
		android:layout_height="wrap_content"
		android:paddingTop="20dp"
		android:orientation="horizontal"
		android:paddingBottom="18dp"
		android:paddingStart="16dp">
		android:paddingStart="16dp"
		android:background="?android:attr/selectableItemBackground"
		android:clipChildren="true">

		<ImageView
		android:id="@+id/icon"
		android:layout_height="24dp"
		android:layout_width="24dp"
		android:layout_gravity="center_vertical\|start"
		android:layout_height="24dp"
		android:layout_marginEnd="14dp"
		android:layout_centerVertical="true"
		android:scaleType="centerInside"/>
		android:scaleType="centerInside"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@id/text_start_guideline"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintTop_toTopOf="parent" />

		<LinearLayout
		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/text_start_guideline"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/text"
		android:layout_toEndOf="@+id/icon"
		android:layout_gravity="center_vertical"
		android:layout_centerVertical="true"
		android:orientation="vertical">
		android:orientation="vertical"
		app:layout_constraintStart_toEndOf="@id/icon" />

		<TextView
		android:id="@+id/label"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="center_vertical"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
		android:ellipsize="end"
		android:lines="1"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
		app:layout_constraintBottom_toTopOf="@id/count"
		app:layout_constraintEnd_toStartOf="@id/expand_button_wrapper"
		app:layout_constraintStart_toEndOf="@id/text_start_guideline"
		app:layout_constraintTop_toTopOf="parent" />

		<TextView
		android:id="@+id/count"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:layout_gravity="start\|center_vertical"
		android:textDirection="locale"
		android:paddingTop="4dp"
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"/>
		</LinearLayout>
		android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
		android:textDirection="locale"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toStartOf="@id/expand_button_wrapper"
		app:layout_constraintStart_toEndOf="@id/text_start_guideline"
		app:layout_constraintTop_toBottomOf="@id/label" />

		<include layout="@*android:layout/notification_expand_button"
		<FrameLayout
		android:id="@+id/expand_button_wrapper"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"
		android:layout_gravity="center_vertical"
		/>
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintTop_toTopOf="parent">

		<include
		layout="@*android:layout/notification_expand_button"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />

		</FrameLayout>

		</RelativeLayout>
		</androidx.constraintlayout.widget.ConstraintLayout>

		<View
		android:layout_width="match_parent"
		@@ -85,20 +101,20 @@
		android:layout_height="wrap_content">

		<com.android.settings.notification.history.NotificationHistoryRecyclerView
		android:id="@+id/notification_list"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:id="@+id/notification_list"
		android:clipChildren="true"
		android:clipToPadding="true"
		android:clipToOutline="true"
		android:clipToPadding="true"
		android:importantForAccessibility="yes"
		app:layout_constrainedHeight="true"
		app:layout_constraintHeight_min="48dp"
		app:layout_constraintHeight_max="500dp"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHeight_max="500dp"
		app:layout_constraintHeight_min="48dp"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"/>
		app:layout_constraintTop_toTopOf="parent" />

		</androidx.constraintlayout.widget.ConstraintLayout>