summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Flynn <flynn@google.com>2012-06-05 15:00:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-05 15:00:17 -0700
commitd63e27eed277485df45fa2a719b4878a8ec31215 (patch)
tree18975b20415ea38846aeb9be16c43630495dcc53
parentefaac3d4d77c76a02042746c93712d80b965c0c0 (diff)
parente6d3361ee85bf88f1f55970d7d80a20b31ea9ea7 (diff)
downloadandroid_packages_apps_Trebuchet-d63e27eed277485df45fa2a719b4878a8ec31215.tar.gz
android_packages_apps_Trebuchet-d63e27eed277485df45fa2a719b4878a8ec31215.tar.bz2
android_packages_apps_Trebuchet-d63e27eed277485df45fa2a719b4878a8ec31215.zip
am e6d3361e: Merge "Don\'t set hard width/height for cling OK button." into jb-dev
* commit 'e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7': Don't set hard width/height for cling OK button.
-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"