summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Morales <anmorales@google.com>2014-10-14 22:26:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-14 22:26:15 +0000
commitd3948a2eda0b4adc2541ae19fe87c067459a69d9 (patch)
treee07c3ea02dd9e5554a158557eaf14c4dddd546d6
parent7d89e294b5ea6f3501a67e019549bae63cb1eee7 (diff)
parent1686335a7775f41e4c56f3ecdfed10fdc6ea2cc3 (diff)
downloadpackages_apps_Settings-d3948a2eda0b4adc2541ae19fe87c067459a69d9.zip
packages_apps_Settings-d3948a2eda0b4adc2541ae19fe87c067459a69d9.tar.gz
packages_apps_Settings-d3948a2eda0b4adc2541ae19fe87c067459a69d9.tar.bz2
am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '1686335a7775f41e4c56f3ecdfed10fdc6ea2cc3': Set layout_width in WiFi+NFC resource
-rw-r--r--res/layout/write_wifi_config_to_nfc.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/layout/write_wifi_config_to_nfc.xml b/res/layout/write_wifi_config_to_nfc.xml
index ee1bb7c..9b19df7 100644
--- a/res/layout/write_wifi_config_to_nfc.xml
+++ b/res/layout/write_wifi_config_to_nfc.xml
@@ -20,6 +20,8 @@
<LinearLayout android:id="@+id/password_layout"
style="@style/wifi_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
android:padding="8dip"
android:orientation="vertical" >