workspace bug fixes
- fixed: pressing home sometimes left workspaces
in shrunken state
- fixed: position of delete zone (trash icon)
- fixed: workspace unshrink sometimes looked weird
when coming from all apps
- fixed: clicking power button and returning left
workspace in shrunken state
Change-Id: Ie974202926e6880ccda26ac9fe967fb587a9b7a3
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 395b048..6eb9318 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -69,6 +69,16 @@
android:onClick="onClickConfigureButton"
android:focusable="true"
android:clickable="true" />
+ <com.android.launcher2.DeleteZone
+ android:id="@+id/delete_zone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/delete_zone_padding"
+
+ android:scaleType="center"
+ android:src="@drawable/delete_zone_selector"
+ android:visibility="gone"
+ launcher:direction="horizontal" />
<ImageView
android:id="@+id/all_apps_button"
android:layout_width="wrap_content"
@@ -79,17 +89,6 @@
android:onClick="onClickAllAppsButton"
android:focusable="true"
android:clickable="true" />
- <com.android.launcher2.DeleteZone
- android:id="@+id/delete_zone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/delete_zone_padding"
- android:layout_toRightOf="@id/configure_button"
-
- android:scaleType="center"
- android:src="@drawable/delete_zone_selector"
- android:visibility="gone"
- launcher:direction="horizontal" />
</RelativeLayout>
<TabHost
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index 9e98e46..c9bd836 100644
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -24,4 +24,7 @@
<!-- vertical spacing between edge of screen and mini screen thumbnails -->
<dimen name="smallScreenVerticalMargin">20dip</dimen>
+
+ <!-- padding above the delete zone -->
+ <dimen name="delete_zone_padding">6dip</dimen>
</resources>