diff options
author | Michael Jurka <mikejurka@google.com> | 2010-08-10 14:18:43 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-10 14:18:43 -0700 |
commit | 925b481acb41b277a16f0a73f5aa8f9423ab60cd (patch) | |
tree | 5a2ba6afaf0b49277b723df525857d0e0532f7d5 /res | |
parent | cceb91c1e905f4898b36e8e6e7d933f4cf6a2f70 (diff) | |
parent | 4cb3724a2c1e5f278e1531d643accc40fcd8e219 (diff) | |
download | android_packages_apps_Trebuchet-925b481acb41b277a16f0a73f5aa8f9423ab60cd.tar.gz android_packages_apps_Trebuchet-925b481acb41b277a16f0a73f5aa8f9423ab60cd.tar.bz2 android_packages_apps_Trebuchet-925b481acb41b277a16f0a73f5aa8f9423ab60cd.zip |
Merge "workspace bug fixes"
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge/launcher.xml | 21 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 3 |
2 files changed, 13 insertions, 11 deletions
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml index 395b04871..6eb9318b4 100644 --- a/res/layout-xlarge/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -69,27 +69,26 @@ android:onClick="onClickConfigureButton" android:focusable="true" android:clickable="true" /> - <ImageView - android:id="@+id/all_apps_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/configure_button" - android:src="@drawable/all_apps_button" - - 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" /> + <ImageView + android:id="@+id/all_apps_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toRightOf="@id/configure_button" + android:src="@drawable/all_apps_button" + + android:onClick="onClickAllAppsButton" + android:focusable="true" + android:clickable="true" /> </RelativeLayout> <TabHost diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 9e98e4690..c9bd8366c 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> |