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

Commit e8fe8267 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Wrap around text so that it isn't cut off" into rvc-dev am: ae0bc25d 

Change-Id: I2e10d863a163a217e1275e8ef74b8c2892f7d1ba
parents 4b4d5264 ae0bc25d

packages/SystemUI/res/layout/keyguard_media_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:gravity="center_horizontal|fill_vertical"

        android:gravity="center"

        android:padding="16dp"

    >

        <ImageView
@@ -67,7 +67,7 @@ 
        <LinearLayout

            android:orientation="vertical"

            android:layout_width="0dp"

            android:layout_height="@dimen/qs_media_album_size"

            android:layout_height="wrap_content"

            android:layout_weight="1"

        >

            <LinearLayout

packages/SystemUI/res/layout/qs_media_panel.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
            <LinearLayout

                android:orientation="vertical"

                android:layout_width="0dp"

                android:layout_height="@dimen/qs_media_album_size"

                android:layout_height="wrap_content"

                android:layout_weight="1"

            >

                <LinearLayout