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

Commit 6bd44413 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400

Change-Id: I3fe4948f72389c2b6e25adbb701f3ea8315d2340
parents aab38e2b 2e16b4a0

res/layout/notification_history_app_layout.xml

+22 −8
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">
@@ -78,14 +79,27 @@ 
        android:layout_height="1dp"

        android:background="?android:attr/listDivider"/>



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/notification_list_wrapper"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <com.android.settings.notification.history.NotificationHistoryRecyclerView

        android:id="@+id/notification_list"

            android:layout_width="match_parent"

        android:layout_height="500dp"

            android:layout_height="wrap_content"

            android:id="@+id/notification_list"

            android:clipChildren="true"

            android:clipToPadding="true"

            android:clipToOutline="true"

            android:importantForAccessibility="yes"

        android:scrollbars="none"/>

            app:layout_constrainedHeight="true"

            app:layout_constraintHeight_min="48dp"

            app:layout_constraintHeight_max="500dp"

            app:layout_constraintTop_toTopOf="parent"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintBottom_toBottomOf="parent"/>



    </androidx.constraintlayout.widget.ConstraintLayout>



</LinearLayout>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity { 
            View viewForPackage = LayoutInflater.from(this)

                    .inflate(R.layout.notification_history_app_layout, null);



            final View container = viewForPackage.findViewById(R.id.notification_list);

            final View container = viewForPackage.findViewById(R.id.notification_list_wrapper);

            container.setVisibility(View.GONE);

            View header = viewForPackage.findViewById(R.id.app_header);

            NotificationExpandButton expand = viewForPackage.findViewById(