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

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

Merge "Fixed the progress bar positioning when expanded" into oc-mr1-dev

parents d3428e9a f0a20833

core/res/res/layout/notification_template_material_big_picture.xml

+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,10 @@ 
            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:orientation="vertical">

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

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

            <include layout="@layout/notification_template_progress"

                     android:layout_width="match_parent"

                     android:layout_height="@dimen/notification_progress_bar_height"

                     android:layout_marginTop="@dimen/notification_progress_margin_top"/>

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

        </LinearLayout>

        <ImageView

core/res/res/layout/notification_template_material_big_text.xml

+5 −1
Original line number Diff line number Diff line
@@ -45,7 +45,11 @@ 
            android:orientation="vertical"

            >

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

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

            <include layout="@layout/notification_template_progress"

                android:layout_width="match_parent"

                android:layout_height="@dimen/notification_progress_bar_height"

                android:layout_marginTop="@dimen/notification_progress_margin_top"

                android:layout_marginBottom="6dp"/>

            <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

core/res/res/layout/notification_template_material_inbox.xml

+3 −2
Original line number Diff line number Diff line
@@ -48,8 +48,9 @@ 
                android:layout_height="wrap_content" />

            <include layout="@layout/notification_template_progress"

                android:layout_width="match_parent"

                android:layout_height="15dp"

                android:layout_marginTop="4dp"/>

                android:layout_height="@dimen/notification_progress_bar_height"

                android:layout_marginTop="@dimen/notification_progress_margin_top"

                android:layout_marginBottom="2dp"/>

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

                android:textAppearance="@style/TextAppearance.Material.Notification"

                android:layout_width="match_parent"