commit d63e27eed277485df45fa2a719b4878a8ec31215
author Andrew Flynn <flynn@google.com> Tue Jun 05 15:00:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 05 15:00:17 2012 -0700
tree 18975b20415ea38846aeb9be16c43630495dcc53
parent efaac3d4d77c76a02042746c93712d80b965c0c0
parent e6d3361ee85bf88f1f55970d7d80a20b31ea9ea7

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.

res/layout-sw600dp-port/all_apps_cling.xml

diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml
index 8bf8d15..95d7ff2 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"

res/layout-sw600dp-port/folder_cling.xml

diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
index d154a5b..1b6c1a0 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"