PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increase expand/collapse tap target" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-10 21:54:53 +00:00
committed by Android (Google) Code Review
parent d76e6deb71 0bdffb98c3
commit 35e0d32d0e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/notification_history_app_layout.xml
View File

@@ -24,6 +24,7 @@
android:id="@+id/app_header" android:id="@+id/app_header"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@drawable/button_ripple_radius"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:paddingStart="16dp"> android:paddingStart="16dp">
@@ -58,13 +59,14 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
</LinearLayout> </LinearLayout>
<ImageButton <ImageView
android:id="@+id/expand" android:id="@+id/expand"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_width="48dp" android:layout_width="48dp"
android:background="@drawable/button_ripple_radius" android:scaleType="center"
android:contentDescription="@null"
android:src="@*android:drawable/ic_expand_more"/> android:src="@*android:drawable/ic_expand_more"/>
</RelativeLayout> </RelativeLayout>

11
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -155,21 +155,22 @@ public class NotificationHistoryActivity extends Activity {
final View container = viewForPackage.findViewById(R.id.notification_list); final View container = viewForPackage.findViewById(R.id.notification_list);
container.setVisibility(View.GONE); container.setVisibility(View.GONE);
ImageButton expand = viewForPackage.findViewById(R.id.expand); View header = viewForPackage.findViewById(R.id.app_header);
expand.setContentDescription(container.getVisibility() == View.VISIBLE ImageView expand = viewForPackage.findViewById(R.id.expand);
header.setStateDescription(container.getVisibility() == View.VISIBLE
? getString(R.string.condition_expand_hide) ? getString(R.string.condition_expand_hide)
: getString(R.string.condition_expand_show)); : getString(R.string.condition_expand_show));
int finalI = i; int finalI = i;
expand.setOnClickListener(v -> { header.setOnClickListener(v -> {
container.setVisibility(container.getVisibility() == View.VISIBLE container.setVisibility(container.getVisibility() == View.VISIBLE
? View.GONE : View.VISIBLE); ? View.GONE : View.VISIBLE);
expand.setImageResource(container.getVisibility() == View.VISIBLE expand.setImageResource(container.getVisibility() == View.VISIBLE
? R.drawable.ic_expand_less ? R.drawable.ic_expand_less
: com.android.internal.R.drawable.ic_expand_more); : 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_hide)
: getString(R.string.condition_expand_show)); : getString(R.string.condition_expand_show));
expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED); header.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
mUiEventLogger.logWithPosition( mUiEventLogger.logWithPosition(
(container.getVisibility() == View.VISIBLE) (container.getVisibility() == View.VISIBLE)
? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN ? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN