summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Flynn <flynn@google.com>2012-06-06 16:13:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-06 16:13:33 -0700
commit248dc2747ecab5030e3a0967d0e845e16f0d4118 (patch)
tree6411b29ed872d2c5cc01fe3d3f6c7248b567e897
parent2be622ac5f0320aba1c93fc7987aecfc65dce7f8 (diff)
parent5766032503a4ace048e69d6540a46134a858cbb9 (diff)
downloadandroid_packages_apps_Trebuchet-248dc2747ecab5030e3a0967d0e845e16f0d4118.zip
android_packages_apps_Trebuchet-248dc2747ecab5030e3a0967d0e845e16f0d4118.tar.gz
android_packages_apps_Trebuchet-248dc2747ecab5030e3a0967d0e845e16f0d4118.tar.bz2
am 57660325: Merge "Update 600dp clings." into jb-dev
* commit '5766032503a4ace048e69d6540a46134a858cbb9': Update 600dp clings.
-rw-r--r--res/layout-sw600dp-port/all_apps_cling.xml5
-rw-r--r--res/layout-sw600dp-port/folder_cling.xml1
2 files changed, 4 insertions, 2 deletions
diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml
index 95d7ff2..0498224 100644
--- a/res/layout-sw600dp-port/all_apps_cling.xml
+++ b/res/layout-sw600dp-port/all_apps_cling.xml
@@ -41,9 +41,10 @@
<Button
style="@style/ClingButton"
android:id="@+id/cling_dismiss"
+ android:minWidth="168dp"
android:textSize="24sp"
- android:layout_marginBottom="27dp"
+ android:layout_marginTop="235dp"
android:layout_marginRight="36dp"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="top|right"
android:onClick="dismissAllAppsCling" />
</com.android.launcher2.Cling>
diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml
index 1b6c1a0..e3a9caa 100644
--- a/res/layout-sw600dp-port/folder_cling.xml
+++ b/res/layout-sw600dp-port/folder_cling.xml
@@ -42,6 +42,7 @@
<Button
style="@style/ClingButton"
android:id="@+id/cling_dismiss"
+ android:minWidth="168dp"
android:textSize="24sp"
android:layout_marginBottom="27dp"
android:layout_marginRight="36dp"