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

Commit 94be10a8 authored by Christine Franks's avatar Christine Franks Committed by android-build-merger
Browse files

Merge "Align settings seekbar to match other preferences" into oc-dev am: 532a88dc

am: f51db284

Change-Id: Ia800103ddfe332c1e1cc2fe50df98d90122fda8a
parents 4e6e0048 f51db284
Loading
Loading
Loading
Loading
+16 −16
Original line number Diff line number Diff line
@@ -19,36 +19,36 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:layout_marginTop="6dp"
    android:layout_marginBottom="6dp"
    android:gravity="center_vertical"
    android:minHeight="?android:attr/listPreferredItemHeight"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
    android:paddingBottom="6dp"
    android:paddingTop="6dp">
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

    <TextView
        android:id="@android:id/title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="60dp"
        android:layout_marginEnd="8dp"
        android:ellipsize="marquee"
        android:fadingEdge="horizontal"
        android:paddingStart="56dp"
        android:paddingEnd="8dp"
        android:singleLine="true"
        android:textAppearance="@android:style/TextAppearance.Material.Subhead"
        android:textColor="?android:attr/textColorPrimary"
        android:ellipsize="marquee"
        android:fadingEdge="horizontal" />
        android:textColor="?android:attr/textColorPrimary" />

    <TextView
        android:id="@android:id/summary"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="60dp"
        android:layout_marginEnd="8dp"
        android:layout_below="@android:id/title"
        android:layout_alignStart="@android:id/title"
        android:layout_below="@android:id/title"
        android:maxLines="4"
        android:paddingStart="56dp"
        android:paddingEnd="8dp"
        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
        android:textColor="?android:attr/textColorSecondary"
        android:maxLines="4" />
        android:textColor="?android:attr/textColorSecondary" />

    <com.android.settings.widget.DefaultIndicatorSeekBar
        android:id="@*android:id/seekbar"
@@ -57,7 +57,7 @@
        android:layout_height="48dp"
        android:layout_alignParentEnd="true"
        android:layout_below="@android:id/summary"
        android:layout_marginEnd="8dp"
        android:layout_marginStart="44dp" />
        android:paddingStart="56dp"
        android:paddingEnd="8dp" />

</RelativeLayout>