Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e0d32d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents d76e6deb 0bdffb98

res/layout/notification_history_app_layout.xml

+4 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/notification/history/NotificationHistoryActivity.java

+6 −5
Original line number Diff line number Diff line
@@ -155,21 +155,22 @@ public class NotificationHistoryActivity extends Activity { 


            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