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

Commit 0fa9371b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9024801 from 048bc692 to tm-qpr1-release 

Change-Id: I46d29f3f61e5de222fc4513148bee319a30b8425
parents 87208071 048bc692

res/layout/card_preference.xml

+15 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
    android:clipToPadding="false"

    android:baselineAligned="false">



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



    <RelativeLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"
@@ -36,10 +34,22 @@ 
        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <LinearLayout

            android:id="@+id/card_preference_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignTop="@android:id/title"

            android:layout_alignBottom="@android:id/summary"

            android:gravity="center_vertical">



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

        </LinearLayout>



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toEndOf="@+id/card_preference_parent"

            android:maxLines="2"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"/>
@@ -61,7 +71,7 @@ 
            android:id="@+id/card_preference_buttons"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:layout_marginTop="24dp"

            android:layout_below="@android:id/summary"

            android:visibility="gone">

            <Button
@@ -69,7 +79,7 @@ 
                style="@style/CardPreferencePrimaryButton"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_marginHorizontal="4dp"

                android:layout_marginStart="20dp"

                android:layout_toStartOf="@android:id/button2"

                android:visibility="gone"/>

            <Button
@@ -77,7 +87,7 @@ 
                style="@style/CardPreferenceBorderlessButton"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_marginHorizontal="4dp"

                android:layout_marginHorizontal="20dp"

                android:layout_alignParentEnd="true"

                android:visibility="gone"/>

        </RelativeLayout>

res/layout/card_preference_layout.xml

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
    android:id="@+id/container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="8dp"

    android:layout_marginVertical="8dp"

    android:layout_marginStart="24dp"

    android:layout_marginEnd="16dp"

    android:foreground="@drawable/contextual_card_background"

    android:clickable="true"

    style="@style/ContextualCardStyle">