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

Commit d64a7d35 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Notification layout fixes:" into sc-dev am: 10de71a3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805134

Change-Id: I216b323adfc4c470a0aaf9f1690a6a1da6467314
parents c4606fec 10de71a3

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -5597,7 +5597,7 @@ public class Notification implements Parcelable 
        private void bindSnoozeAction(RemoteViews big, StandardTemplateParams p) {

            boolean hideSnoozeButton = mN.isForegroundService() || mN.fullScreenIntent != null

                    || isBackgroundColorized(p)

                    || p.mViewType == StandardTemplateParams.VIEW_TYPE_HEADS_UP;

                    || p.mViewType != StandardTemplateParams.VIEW_TYPE_BIG;

            big.setBoolean(R.id.snooze_button, "setEnabled", !hideSnoozeButton);

            if (hideSnoozeButton) {

                // Only hide; NotificationContentView will show it when it adds the click listener

core/res/res/layout/notification_template_material_base.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
  ~ limitations under the License

  -->



<com.android.internal.widget.NotificationMaxHeightFrameLayout

<FrameLayout

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

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_weight="1"

    android:minHeight="@dimen/notification_headerless_min_height"

    android:tag="base"

    >
@@ -166,4 +167,4 @@ 


    </LinearLayout>



</com.android.internal.widget.NotificationMaxHeightFrameLayout>
 
</FrameLayout>

core/res/res/layout/notification_template_material_heads_up_base.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:tag="headsUp"

    >



    <com.android.internal.widget.RemeasuringLinearLayout

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:clipChildren="false"
@@ -35,7 +35,7 @@ 
            android:id="@null"

            />



        <com.android.internal.widget.RemeasuringLinearLayout

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-20dp"
@@ -60,6 +60,6 @@ 
                />



            <include layout="@layout/notification_material_action_list" />

        </com.android.internal.widget.RemeasuringLinearLayout>

    </com.android.internal.widget.RemeasuringLinearLayout>

        </LinearLayout>

    </LinearLayout>

</FrameLayout>

core/res/res/layout/notification_template_material_messaging.xml

+2 −0
Original line number Diff line number Diff line
@@ -199,11 +199,13 @@ 
            android:id="@+id/notification_action_list_margin_target"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-20dp"

            android:clipChildren="false"

            android:orientation="vertical">

        <include layout="@layout/notification_template_smart_reply_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginTop="@dimen/notification_content_margin"

                android:layout_marginStart="@dimen/notification_content_margin_start"

                android:layout_marginEnd="@dimen/notification_content_margin_end" />

        <include layout="@layout/notification_material_action_list" />

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ 
    <dimen name="notification_max_heads_up_height_before_s">162dp</dimen>



    <!-- Height of a heads up notification in the status bar -->

    <dimen name="notification_max_heads_up_height">143dp</dimen>

    <dimen name="notification_max_heads_up_height">136dp</dimen>



    <!-- Height of a heads up notification in the status bar -->

    <dimen name="notification_max_heads_up_height_increased">188dp</dimen>