summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Flynn <flynn@google.com>2012-06-05 14:41:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-05 14:41:41 -0700
commite6d3361ee85bf88f1f55970d7d80a20b31ea9ea7 (patch)
tree18975b20415ea38846aeb9be16c43630495dcc53
parentbbf595dced57bbc16633eb7d6583b1bf27a2508d (diff)
parent04617ad4c8b8aaadfeb1c0f60420784008987c28 (diff)
downloadandroid_packages_apps_Trebuchet-e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7.tar.gz
android_packages_apps_Trebuchet-e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7.tar.bz2
android_packages_apps_Trebuchet-e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7.zip
Merge "Don't set hard width/height for cling OK button." into jb-dev
-rw-r--r--res/layout-sw600dp-port/all_apps_cling.xml2
-rw-r--r--res/layout-sw600dp-port/folder_cling.xml2
2 files changed, 0 insertions, 4 deletions
diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml
index 8bf8d15ce..95d7ff2fb 100644
--- a/res/layout-sw600dp-port/all_apps_cling.xml
+++ b/res/layout-sw600dp-port/all_apps_cling.xml
@@ -41,8 +41,6 @@
<Button
style="@style/ClingButton"
android:id="@+id/cling_dismiss"
- android:layout_width="118dp"
- android:layout_height="54dp"
android:textSize="24sp"
android:layout_marginBottom="27dp"
android:layout_marginRight="36dp"
diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
index d154a5b16..1b6c1a01a 100644
--- a/res/layout-sw600dp-port/folder_cling.xml
+++ b/res/layout-sw600dp-port/folder_cling.xml
@@ -42,8 +42,6 @@
<Button
style="@style/ClingButton"
android:id="@+id/cling_dismiss"
- android:layout_width="118dp"
- android:layout_height="54dp"
android:textSize="24sp"
android:layout_marginBottom="27dp"
android:layout_marginRight="36dp"