From 6fa72607b8fb162909a16a7f5069d3b39855d5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Mon, 10 Mar 2014 18:19:15 +0100
Subject: [PATCH] Fix relative layouts on <4.2, broken while trying to add RTL
 support

---
 res/layout/about.xml             |  5 +++++
 res/layout/addrepo.xml           |  1 +
 res/layout/apklistitem.xml       |  6 ++++++
 res/layout/appdetails.xml        |  9 +++++++++
 res/layout/applistitem.xml       | 11 +++++++++++
 res/layout/repo_item.xml         |  3 +++
 res/layout/repodetails.xml       | 10 +++++++++-
 res/layout/repodiscoveryitem.xml |  2 ++
 res/layout/repodiscoverylist.xml |  2 ++
 res/layout/searchresults.xml     |  2 ++
 10 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/res/layout/about.xml b/res/layout/about.xml
index 7a3837d06..203e19d3e 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:paddingLeft="8dp"
 	android:paddingStart="8dp"
+	android:paddingRight="8dp"
 	android:paddingEnd="8dp"
 	android:paddingTop="6dp"
 	android:paddingBottom="6dp"
@@ -20,6 +22,7 @@
 			android:layout_height="wrap_content" />
 
 		<TextView android:id="@+id/version"
+			android:paddingLeft="5dp"
 			android:paddingStart="5dp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />
@@ -38,6 +41,7 @@
 
 		<TextView android:id="@+id/sitec"
 			android:text="@string/about_sitec"
+			android:paddingLeft="5dp"
 			android:paddingStart="5dp"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content" />
@@ -57,6 +61,7 @@
 
 		<TextView android:id="@+id/mailc"
 			android:text="@string/about_mailc"
+			android:paddingLeft="5dp"
 			android:paddingStart="5dp"
 			android:autoLink="email"
 			android:layout_width="wrap_content"
diff --git a/res/layout/addrepo.xml b/res/layout/addrepo.xml
index 4910a3663..665d4fe8c 100644
--- a/res/layout/addrepo.xml
+++ b/res/layout/addrepo.xml
@@ -36,6 +36,7 @@
         android:id="@+id/overwrite_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:drawableLeft="@android:drawable/ic_dialog_alert"
         android:drawableStart="@android:drawable/ic_dialog_alert"
         android:drawablePadding="20dp"
         android:padding="20dp"
diff --git a/res/layout/apklistitem.xml b/res/layout/apklistitem.xml
index 4eec65c00..6208b3af2 100644
--- a/res/layout/apklistitem.xml
+++ b/res/layout/apklistitem.xml
@@ -30,6 +30,7 @@
 
   <TextView android:id="@+id/buildtype"
 		android:textSize="13sp"
+		android:layout_alignParentRight="true"
 		android:layout_alignParentEnd="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
@@ -38,6 +39,7 @@
   <TextView android:id="@+id/size"
 		android:textSize="13sp"
 		android:layout_below="@id/buildtype"
+		android:layout_alignParentRight="true"
 		android:layout_alignParentEnd="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
@@ -46,7 +48,9 @@
   <TextView android:id="@+id/api"
 		android:textSize="13sp"
 		android:layout_below="@id/buildtype"
+		android:layout_toLeftOf="@id/size"
 		android:layout_toStartOf="@id/size"
+		android:layout_marginRight="16sp"
 		android:layout_marginEnd="16sp"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content" />
@@ -54,6 +58,7 @@
   <TextView android:id="@+id/nativecode"
 		android:textSize="13sp"
 		android:layout_below="@id/size"
+		android:layout_alignParentRight="true"
 		android:layout_alignParentEnd="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content" />
@@ -61,6 +66,7 @@
   <TextView android:id="@+id/incompatible_reasons"
 		android:textSize="13sp"
 		android:layout_below="@id/added"
+		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true"
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content" />
diff --git a/res/layout/appdetails.xml b/res/layout/appdetails.xml
index bd8721239..352c8a687 100644
--- a/res/layout/appdetails.xml
+++ b/res/layout/appdetails.xml
@@ -24,6 +24,7 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_centerVertical="true"
+			android:layout_toRightOf="@id/icon"
 			android:layout_toEndOf="@id/icon"
 			android:padding="5dp"
 			android:baselineAligned="false"
@@ -34,9 +35,11 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_alignParentTop="true"
+				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"
 				android:singleLine="true"
 				android:ellipsize="end"
+				android:layout_marginLeft="6sp"
 				android:layout_marginStart="6sp"
 				android:textSize="12sp" />
 
@@ -48,8 +51,10 @@
 				android:ellipsize="end"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_alignParentLeft="true"
 				android:layout_alignParentStart="true"
 				android:textAlignment="viewStart"
+				android:layout_toLeftOf="@id/license"
 				android:layout_toStartOf="@id/license" />
 
 			<TextView
@@ -58,7 +63,9 @@
 				android:layout_height="wrap_content"
 				android:singleLine="true"
 				android:ellipsize="end"
+				android:layout_alignParentRight="true"
 				android:layout_alignParentEnd="true"
+				android:layout_marginLeft="6sp"
 				android:layout_marginStart="6sp"
 				android:layout_below="@id/title"
 				android:textSize="12sp" />
@@ -70,8 +77,10 @@
 				android:singleLine="true"
 				android:ellipsize="end"
 				android:textSize="12sp"
+				android:layout_alignParentLeft="true"
 				android:layout_alignParentStart="true"
 				android:textAlignment="viewStart"
+				android:layout_toLeftOf="@id/categories"
 				android:layout_toStartOf="@id/categories"
 				android:layout_below="@id/title" />
 
diff --git a/res/layout/applistitem.xml b/res/layout/applistitem.xml
index 5ccf7f6dc..b697f3242 100644
--- a/res/layout/applistitem.xml
+++ b/res/layout/applistitem.xml
@@ -19,8 +19,11 @@
 		android:orientation="vertical"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
+		android:paddingLeft="5dp"
 		android:paddingStart="5dp"
+		android:paddingRight="5dp"
 		android:paddingEnd="5dp"
+		android:layout_toRightOf="@id/icon"
 		android:layout_toEndOf="@id/icon"
 		android:layout_centerVertical="true"
 		android:baselineAligned="false" >
@@ -31,8 +34,10 @@
 			android:ellipsize="end"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_marginLeft="6sp"
 			android:layout_marginStart="6sp"
 			android:layout_alignParentTop="true"
+			android:layout_alignParentRight="true"
 			android:layout_alignParentEnd="true" />
 
 		<TextView android:id="@+id/name"
@@ -43,8 +48,10 @@
 			android:ellipsize="end"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"
 			android:textAlignment="viewStart"
+			android:layout_toLeftOf="@id/status"
 			android:layout_toStartOf="@id/status" />
 
 		<TextView android:id="@+id/license"
@@ -53,8 +60,10 @@
 			android:ellipsize="end"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_marginLeft="6sp"
 			android:layout_marginStart="6sp"
 			android:layout_below="@id/name"
+			android:layout_alignParentRight="true"
 			android:layout_alignParentEnd="true" />
 
 		<TextView android:id="@+id/summary"
@@ -64,8 +73,10 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_below="@id/name"
+			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"
 			android:textAlignment="viewStart"
+			android:layout_toLeftOf="@id/license"
 			android:layout_toStartOf="@id/license" />
 
 	</RelativeLayout>
diff --git a/res/layout/repo_item.xml b/res/layout/repo_item.xml
index 9c0e10951..c2e4bffa6 100644
--- a/res/layout/repo_item.xml
+++ b/res/layout/repo_item.xml
@@ -15,6 +15,7 @@
     <ImageView android:id="@+id/img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true" />
 
     <TextView android:id="@+id/repo_name"
@@ -24,7 +25,9 @@
         android:ellipsize="marquee"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/img"
         android:layout_toEndOf="@id/img"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"/>
 
     <TextView android:id="@+id/repo_unsigned"
diff --git a/res/layout/repodetails.xml b/res/layout/repodetails.xml
index 4168a0ef5..86cb9b1a2 100644
--- a/res/layout/repodetails.xml
+++ b/res/layout/repodetails.xml
@@ -7,7 +7,9 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:paddingTop="@dimen/padding_top"
+    android:paddingLeft="@dimen/padding_side"
     android:paddingStart="@dimen/padding_side"
+    android:paddingRight="@dimen/padding_side"
     android:paddingEnd="@dimen/padding_side">
 
     <!-- Editable URL of this repo -->
@@ -16,6 +18,7 @@
         android:layout_height="wrap_content"
         android:id="@+id/label_repo_url"
         android:text="@string/repo_url"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true" />
     <EditText
@@ -32,6 +35,7 @@
         android:id="@+id/label_repo_name"
         android:text="@string/repo_name"
         android:layout_below="@id/input_repo_url"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/form_label_top"/>
     <TextView
@@ -48,6 +52,7 @@
         android:id="@+id/label_description"
         android:text="@string/repo_description"
         android:layout_below="@id/text_repo_name"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/form_label_top"/>
     <TextView
@@ -65,6 +70,7 @@
         android:id="@+id/label_num_apps"
         android:text="@string/repo_num_apps"
         android:layout_below="@id/text_description"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/form_label_top" />
     <TextView
@@ -80,6 +86,7 @@
         android:id="@+id/label_last_update"
         android:text="@string/repo_last_update"
         android:layout_below="@id/text_num_apps"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/form_label_top" />
     <TextView
@@ -95,6 +102,7 @@
         android:id="@+id/label_repo_fingerprint"
         android:text="@string/repo_fingerprint"
         android:layout_below="@id/text_last_update"
+        android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:paddingTop="@dimen/form_label_top" />
     <TextView
@@ -130,4 +138,4 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/text_not_yet_updated"/>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/repodiscoveryitem.xml b/res/layout/repodiscoveryitem.xml
index b6039dfbd..4b0a215f0 100644
--- a/res/layout/repodiscoveryitem.xml
+++ b/res/layout/repodiscoveryitem.xml
@@ -8,6 +8,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:maxLines="1"
+          android:paddingLeft="8sp"
           android:paddingStart="8sp"
           android:text="Discovered Repo Name"
           android:textSize="16sp"
@@ -19,6 +20,7 @@
           android:layout_height="wrap_content"
           android:layout_below="@+id/reposcanitemname"
           android:layout_marginTop="2dp"
+          android:paddingLeft="8sp"
           android:paddingStart="8sp"
           android:maxLines="1"
           android:text="Repo Address"
diff --git a/res/layout/repodiscoverylist.xml b/res/layout/repodiscoverylist.xml
index 0a8f46052..cdd85147d 100644
--- a/res/layout/repodiscoverylist.xml
+++ b/res/layout/repodiscoverylist.xml
@@ -8,6 +8,7 @@
 	    android:layout_width="match_parent"
 	    android:layout_height="50dp"
 	    android:layout_alignParentTop="true"
+	    android:layout_alignParentLeft="true"
 	    android:layout_alignParentStart="true"
 	    android:layout_centerHorizontal="true"
 	    android:paddingTop="8sp" >
@@ -18,6 +19,7 @@
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
 	        android:layout_gravity="center_horizontal"
+	        android:layout_marginRight="5dp"
 	        android:layout_marginEnd="5dp"
 	        android:indeterminate="true" />
 
diff --git a/res/layout/searchresults.xml b/res/layout/searchresults.xml
index 29ce735c6..41ba64b45 100644
--- a/res/layout/searchresults.xml
+++ b/res/layout/searchresults.xml
@@ -2,7 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
+	android:paddingLeft="2dp"
 	android:paddingStart="2dp"
+	android:paddingRight="2dp"
 	android:paddingEnd="2dp"
 	android:baselineAligned="false"
 	android:orientation="vertical">