summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-05-30 09:55:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-30 09:55:45 -0700
commit8242901e1682826137208bfe2fe35c8f50fa0be8 (patch)
tree1ad45a81b2d4460ef244ca44b1df245a3de616b6
parenta99d1125e2ede99391e8cff6c4bee179fdc81d06 (diff)
parent77859dfa79c57b814734e788bfdc0e003b3a5cdb (diff)
downloadpackages_apps_settings-8242901e1682826137208bfe2fe35c8f50fa0be8.zip
packages_apps_settings-8242901e1682826137208bfe2fe35c8f50fa0be8.tar.gz
packages_apps_settings-8242901e1682826137208bfe2fe35c8f50fa0be8.tar.bz2
Merge "Adjust layout to avoid clipping." into jb-dev
-rw-r--r--res/layout/wifi_dialog.xml2
-rw-r--r--res/values-sw600dp/styles.xml6
-rw-r--r--res/values/styles.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 0e6d63a..5103e8b 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content">
<LinearLayout
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 058afb9..2b01d7f 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -21,11 +21,11 @@
</style>
<style name="wifi_item">
- <item name="android:layout_width">560dip</item>
+ <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">8dip</item>
- <item name="android:layout_marginLeft">32dip</item>
- <item name="android:layout_marginRight">32dip</item>
+ <item name="android:layout_marginLeft">16dip</item>
+ <item name="android:layout_marginRight">16dip</item>
<item name="android:orientation">horizontal</item>
<item name="android:gravity">center_vertical</item>
</style>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8723982..42f2837 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -107,7 +107,7 @@
</style>
<style name="wifi_item">
- <item name="android:layout_width">200dip</item>
+ <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">8dip</item>
<item name="android:layout_marginLeft">16dip</item>