From 1eec4084edaea275d1482e21a71ed8815eca0008 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 15 May 2017 15:19:09 -0700
Subject: [PATCH] Fix vpn config dialog text alignment in RTL locales

Change-Id: Ifc5a14285a337b2b168a4c6770d92f3da328b9d0
Fix: 38142136
Test: visual
---
 res/layout/vpn_dialog.xml | 3 ++-
 res/values/styles.xml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index 47be3689c6..71ce0adedf 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -37,7 +37,8 @@
             <TextView style="@style/vpn_label"
                     android:text="@string/vpn_type"
                     android:labelFor="@+id/type"/>
-            <Spinner style="@style/vpn_value" android:id="@+id/type"
+            <Spinner style="@style/vpn_value"
+                     android:id="@+id/type"
                     android:prompt="@string/vpn_type"
                     android:entries="@array/vpn_types"/>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0780e82d8c..0279e9da15 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -282,6 +282,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:singleLine">true</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="vpn_warning">
-- 
2.11.0