OSDN Git Service

Clean up RTL in Wi-Fi details dialog.
authorJeff Sharkey <jsharkey@android.com>
Thu, 7 Feb 2013 23:45:29 +0000 (15:45 -0800)
committerJeff Sharkey <jsharkey@android.com>
Thu, 7 Feb 2013 23:45:29 +0000 (15:45 -0800)
Bug: 7677078
Change-Id: Ic7652bc7bd0bc24ccacbe1135e763190cc6f12cd

res/layout/wifi_dialog.xml
res/values/styles.xml

index 4824be6..7a7d0b0 100644 (file)
@@ -21,7 +21,8 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="8dip">
 
         <LinearLayout android:id="@+id/info"
                 style="@style/wifi_section" />
@@ -38,7 +39,7 @@
                         android:textDirection="locale" />
 
                 <EditText android:id="@+id/ssid"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_edit_content"
                         android:maxLength="32"
                         android:singleLine="true"
                         android:inputType="textNoSuggestions" />
                             android:text="@string/wifi_eap_identity" />
 
                     <EditText android:id="@+id/identity"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:inputType="textNoSuggestions" />
                 </LinearLayout>
                             android:text="@string/wifi_eap_anonymous" />
 
                     <EditText android:id="@+id/anonymous"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:inputType="textNoSuggestions" />
                 </LinearLayout>
                         android:text="@string/wifi_password" />
 
                 <EditText android:id="@+id/password"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_edit_content"
                         android:singleLine="true"
                         android:password="true" />
             </LinearLayout>
                             android:text="@string/proxy_hostname_label" />
 
                     <EditText android:id="@+id/proxy_hostname"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_hostname_hint"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true" />
                             android:text="@string/proxy_port_label" />
 
                     <EditText android:id="@+id/proxy_port"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_port_hint"
                             android:inputType="number"
                             android:singleLine="true" />
                             android:text="@string/proxy_exclusionlist_label" />
 
                     <EditText android:id="@+id/proxy_exclusionlist"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_exclusionlist_hint"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true" />
                             android:text="@string/wifi_ip_address" />
 
                     <EditText android:id="@+id/ipaddress"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_ip_address_hint"
                             android:inputType="textNoSuggestions" />
                             android:text="@string/wifi_gateway" />
 
                     <EditText android:id="@+id/gateway"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_gateway_hint"
                             android:inputType="textNoSuggestions" />
                             android:text="@string/wifi_network_prefix_length" />
 
                     <EditText android:id="@+id/network_prefix_length"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_network_prefix_length_hint"
                             android:inputType="number" />
                             android:text="@string/wifi_dns1" />
 
                     <EditText android:id="@+id/dns1"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns1_hint"
                             android:inputType="textNoSuggestions" />
                             android:text="@string/wifi_dns2" />
 
                     <EditText android:id="@+id/dns2"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns2_hint"
                             android:inputType="textNoSuggestions" />
index dda22d9..ebd8722 100644 (file)
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">18sp</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
+    <style name="wifi_item_edit_content">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">18sp</item>
     </style>
 
     <style name="wifi_section">