Merge "Increase expand/collapse tap target" into rvc-qpr-dev
diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index a1b3be7..481253a 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -24,6 +24,7 @@
android:id="@+id/app_header"
android:layout_height="wrap_content"
android:layout_width="match_parent"
+ android:background="@drawable/button_ripple_radius"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingStart="16dp">
@@ -58,13 +59,14 @@
android:paddingTop="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
</LinearLayout>
- <ImageButton
+ <ImageView
android:id="@+id/expand"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_height="48dp"
android:layout_width="48dp"
- android:background="@drawable/button_ripple_radius"
+ android:scaleType="center"
+ android:contentDescription="@null"
android:src="@*android:drawable/ic_expand_more"/>
</RelativeLayout>
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 7635a4f..b184740 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -155,21 +155,22 @@
final View container = viewForPackage.findViewById(R.id.notification_list);
container.setVisibility(View.GONE);
- ImageButton expand = viewForPackage.findViewById(R.id.expand);
- expand.setContentDescription(container.getVisibility() == View.VISIBLE
+ View header = viewForPackage.findViewById(R.id.app_header);
+ ImageView expand = viewForPackage.findViewById(R.id.expand);
+ header.setStateDescription(container.getVisibility() == View.VISIBLE
? getString(R.string.condition_expand_hide)
: getString(R.string.condition_expand_show));
int finalI = i;
- expand.setOnClickListener(v -> {
+ header.setOnClickListener(v -> {
container.setVisibility(container.getVisibility() == View.VISIBLE
? View.GONE : View.VISIBLE);
expand.setImageResource(container.getVisibility() == View.VISIBLE
? R.drawable.ic_expand_less
: com.android.internal.R.drawable.ic_expand_more);
- expand.setContentDescription(container.getVisibility() == View.VISIBLE
+ header.setStateDescription(container.getVisibility() == View.VISIBLE
? getString(R.string.condition_expand_hide)
: getString(R.string.condition_expand_show));
- expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+ header.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
mUiEventLogger.logWithPosition(
(container.getVisibility() == View.VISIBLE)
? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN