summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorPrem Kumar <premk@google.com>2014-12-12 04:40:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-12 04:40:32 +0000
commit394cc0a8980cdbd6457f4e8cbdcaae734430ac43 (patch)
tree1048470125dc2ba4999f7580cfd2d7f3391c7680 /res/layout
parentd2acd90533d0e61dfe074ef35714811dc648fbc2 (diff)
parent78670560cddf0f1e2cff7dab57b2ac768f917367 (diff)
downloadpackages_apps_Settings-394cc0a8980cdbd6457f4e8cbdcaae734430ac43.zip
packages_apps_Settings-394cc0a8980cdbd6457f4e8cbdcaae734430ac43.tar.gz
packages_apps_Settings-394cc0a8980cdbd6457f4e8cbdcaae734430ac43.tar.bz2
am 78670560: am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev automerge: f41c6c4
* commit '78670560cddf0f1e2cff7dab57b2ac768f917367': Clearing junk layout for add wifi dialog in settings.
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/wifi_dialog.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index c1fbc4f..c1d6124 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -64,6 +64,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:minEms="16"
style="@style/wifi_item_label"
android:text="@string/wifi_security" />