commit e68959de3a7f2d47de4816b65262b10e03ef313c
author Fabrice Di Meglio <fdimeglio@google.com> Thu Apr 04 17:59:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 04 17:59:50 2013 +0000
tree 6188f81b95ce5b13d734447df5cb2c5b2d03cd03
parent 186e250ac7f74e8c724919184e949f7bf17afefb
parent f2a9717b93e39d7e15f90e84f8b4de24da11463e

Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

res/layout/wifi_dialog_row.xml

diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index ff04a40..6cac559 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml
@@ -18,7 +18,8 @@
         style="@style/wifi_item" >
     <TextView
             style="@style/wifi_item_label"
-            android:id="@+id/name" />
+            android:id="@+id/name"
+            android:textAlignment="viewStart" />
 
     <TextView
             android:id="@+id/value"

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cf27dd5..9e0f8d7 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -1086,7 +1086,7 @@
             float titleHeight = resources.getFraction(R.dimen.setup_title_height, 1, 1);
             float sideMargin = resources.getFraction(R.dimen.setup_border_width, 1, 1);
             int bottom = resources.getDimensionPixelSize(R.dimen.setup_margin_bottom);
-            setPadding(
+            setPaddingRelative(
                     (int) (parentWidth * sideMargin),
                     0,
                     (int) (parentWidth * sideMargin),