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

* commit '377ab9c2e42f90976f4af7eb362210fb2c409f7a':
  Fix bug #7198585 Settings > Display > Dream completely broken in RTL
This commit is contained in:
Fabrice Di Meglio
2012-09-21 13:34:08 -07:00
committed by Android Git Automerger

View File

@@ -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"