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

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

Merge changes Idd092c44,I85f7686e 

* changes:
  Indication area alignment in AOD
  Fix alignment of ambient notificaiton
parents 5b47a78e 4dfd4324

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -4130,7 +4130,7 @@ public class Notification implements Parcelable 
            final Bundle ex = mN.extras;

            updateBackgroundColor(contentView);

            bindNotificationHeader(contentView, p.ambient, p.headerTextSecondary);

            bindLargeIcon(contentView, p.hideLargeIcon, p.alwaysShowReply);

            bindLargeIcon(contentView, p.hideLargeIcon || p.ambient, p.alwaysShowReply);

            boolean showProgress = handleProgressBar(p.hasProgress, contentView, ex);

            if (p.title != null) {

                contentView.setViewVisibility(R.id.title, View.VISIBLE);

core/res/res/layout/notification_template_material_ambient.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal"

                android:textSize="20sp"

                android:textSize="24sp"

                android:textColor="#ffffffff"

            />

            <TextView android:id="@+id/text"

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ 
    <dimen name="keyguard_affordance_icon_width">24dp</dimen>



    <dimen name="keyguard_indication_margin_bottom">65dp</dimen>

    <dimen name="keyguard_indication_margin_bottom_ambient">30dp</dimen>

    <dimen name="keyguard_indication_margin_bottom_ambient">16dp</dimen>



    <!-- The text size for battery level -->

    <dimen name="battery_level_text_size">12sp</dimen>