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

Commit bc10cd12 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Fix media layout to avoid awkward expansion transitions." into sc-dev

parents 4f097e34 5b49db0f

core/res/res/layout/notification_template_material_big_media.xml

+44 −31
Original line number Original line Diff line number Diff line
@@ -42,7 +42,6 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginBottom="@dimen/notification_content_margin"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:orientation="vertical"

            android:orientation="vertical"

            >

            >
@@ -50,14 +49,26 @@ 
            <include layout="@layout/notification_template_text"/>

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

        </LinearLayout>

        </LinearLayout>





        <!-- this FrameLayout's minHeight serves as a padding for the content above -->

        <FrameLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="38dp"

            android:minHeight="@dimen/notification_content_margin"

            >

            <!-- The layout_marginStart is selected to ensure that action icons which are visually

                 12x12 in a 24x24 drawable will align correctly with the text.  This means that

                 stock media action icons will align, but icons may be visually up to 20x20 and

                 remain in-spec, in which case they will protrude into the column slightly. -->



            <!-- Nesting in FrameLayout is required to ensure that the marginStart actually applies

                 at the start instead of always the left, given that the media_actions LinearLayout

                 has layoutDirection="ltr". -->

            <LinearLayout

            <LinearLayout

                android:id="@+id/media_actions"

                android:id="@+id/media_actions"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_height="wrap_content"

            android:layout_marginTop="-21dp"

                android:layout_marginBottom="@dimen/media_notification_actions_padding_bottom"

            android:paddingStart="44dp"

            android:paddingEnd="44dp"

            android:paddingBottom="@dimen/media_notification_actions_padding_bottom"

                android:gravity="top"

                android:gravity="top"

                android:orientation="horizontal"

                android:orientation="horizontal"

                android:layoutDirection="ltr"

                android:layoutDirection="ltr"
@@ -89,6 +100,8 @@ 
                    />

                    />

            </LinearLayout>

            </LinearLayout>





        </FrameLayout>



    </LinearLayout>

    </LinearLayout>





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

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