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

Commit 377ab9c2 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #7198585 Settings > Display > Dream completely broken in RTL" into jb-mr1-dev

parents 9e143f5e ecadb07b

res/layout/dream_info_row.xml

+10 −9
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:id="@android:id/widget_frame"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_toLeftOf="@+id/divider"

        android:layout_toStartOf="@+id/divider"

        android:background="?android:attr/selectableItemBackground" >



        <!-- Dream icon -->
@@ -34,8 +34,8 @@ 
            android:layout_height="@android:dimen/app_icon_size"

            android:layout_centerVertical="true"

            android:layout_marginBottom="10dp"

            android:layout_marginLeft="0dp"

            android:layout_marginRight="6dp"

            android:layout_marginStart="0dp"

            android:layout_marginEnd="6dp"

            android:layout_marginTop="10dp"

            android:contentDescription="@null"

            android:maxHeight="@android:dimen/app_icon_size"
@@ -49,11 +49,12 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_centerVertical="true"

            android:layout_toLeftOf="@android:id/button1"

            android:layout_toRightOf="@android:id/icon"

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

            android:layout_toEndOf="@android:id/icon"

            android:ellipsize="end"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceMedium" />

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

            android:textDirection="locale" />



        <!-- Dream radio button -->
@@ -61,7 +62,7 @@ 
            android:id="@android:id/button1"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentRight="true"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:duplicateParentState="true" />

    </RelativeLayout>
@@ -73,7 +74,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_centerVertical="true"

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

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

        android:contentDescription="@null"

        android:src="@drawable/nav_divider" />
@@ -84,7 +85,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

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

        android:layout_alignParentRight="true"

        android:layout_alignParentEnd="true"

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

        android:layout_centerVertical="true"

        android:layout_margin="0dip"