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

Commit 00e61f5a authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes I8c1cd4d4,I5ed13c17,If603049c,I5cb7937c into nyc-dev 

* changes:
  Fixed a bug where text would still not animate
  Reseting user expansions when the shade is collapsed
  Added more spacing around notifications
  Fixed an bug with the notification backgrounds
parents 756ac8e0 2268bcf0

core/java/android/app/Notification.java

+2 −1
Original line number Diff line number Diff line
@@ -4222,7 +4222,8 @@ public class Notification implements Parcelable 
            int i=0;

            final float density = mBuilder.mContext.getResources().getDisplayMetrics().density;

            int topPadding = (int) (5 * density);

            int bottomPadding = (int) (13 * density);

            int bottomPadding = mBuilder.mContext.getResources().getDimensionPixelSize(

                    com.android.internal.R.dimen.notification_content_margin_bottom);

            boolean first = true;

            while (i < mTexts.size() && i < rowIds.length) {

                CharSequence str = mTexts.get(i);

core/res/res/layout/notification_template_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
    android:id="@+id/notification_header"

    android:orientation="horizontal"

    android:layout_width="wrap_content"

    android:layout_height="48dp"

    android:layout_height="53dp"

    android:clipChildren="false"

    android:paddingTop="5dp"

    android:paddingTop="10dp"

    android:paddingBottom="16dp"

    android:paddingStart="@dimen/notification_content_margin_start"

    android:paddingEnd="16dp">

core/res/res/layout/notification_template_material_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:layout_marginStart="@dimen/notification_content_margin_start"

        android:layout_marginBottom="11dp"

        android:layout_marginBottom="15dp"

        android:layout_marginEnd="@dimen/notification_content_margin_end" >

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

    </FrameLayout>

core/res/res/layout/notification_template_material_big_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
            android:layout_height="wrap_content"

            android:layout_gravity="bottom"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginBottom="11dp"

            android:layout_marginBottom="15dp"

            android:layout_marginEnd="@dimen/notification_content_margin_end">

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

        </FrameLayout>

core/res/res/layout/notification_template_material_big_media.xml

+5 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    >

    <include layout="@layout/notification_template_header"

        android:layout_width="match_parent"

        android:layout_height="48dp"

        android:layout_height="53dp"

        android:layout_gravity="start"/>

    <LinearLayout

        android:layout_width="match_parent"
@@ -50,9 +50,10 @@ 
            android:id="@+id/media_actions"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="-15dp"

            android:layout_marginTop="-21dp"

            android:paddingStart="8dp"

            android:paddingBottom="8dp"

            android:paddingBottom="12dp"

            android:gravity="top"

            android:orientation="horizontal"

            android:layoutDirection="ltr"

            >
@@ -65,7 +66,7 @@ 
        android:layout_height="@dimen/media_notification_expanded_image_max_size"

        android:minWidth="40dp"

        android:layout_marginEnd="16dp"

        android:layout_marginBottom="16dp"

        android:layout_marginBottom="20dp"

        android:layout_gravity="bottom|end"

        android:scaleType="centerCrop"

        />