From fe0ce01da7a2bc0a0c8430abcf63075d24a1a8d8 Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Tue, 31 May 2016 20:51:01 +0100
Subject: [PATCH] Fix RTL issue in Trusted Credentail page

Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
   to resolve the random issue. I guess it is a framework bug, but
   anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout

Bug: 28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
---
 res/layout/trusted_credential.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index ea13939bf57..cc146f8195c 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -15,37 +15,37 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:background="?android:attr/selectableItemBackground"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="15dip"
-    android:paddingBottom="15dip">
+    android:paddingBottom="15dip"
+    android:orientation="horizontal">
 
-    <RelativeLayout
-        android:layout_width="0px"
+    <LinearLayout
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/trusted_credential_subject_primary"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAlignment="viewStart"/>
 
         <TextView
             android:id="@+id/trusted_credential_subject_secondary"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/trusted_credential_subject_primary"
-            android:layout_alignStart="@id/trusted_credential_subject_primary"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary" />
-
-    </RelativeLayout>
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAlignment="viewStart"/>
+    </LinearLayout>
 
     <!-- Switch is invisible and not gone so that the height is consistent between tabs -->
     <Switch