diff options
author | Michael Jurka <mikejurka@google.com> | 2011-01-26 19:06:58 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 19:06:58 -0800 |
commit | 87d55d23a4e401a777a16e948cc49d48d6c72f5e (patch) | |
tree | 6153851b772798c00bc433e6da14e07b480227e4 /res | |
parent | 40ea381501554444f5d594e82917113fbdddcfe4 (diff) | |
parent | 043d34c0959099b564327ad26b798bcdbc60d2e2 (diff) | |
download | android_packages_apps_Trebuchet-87d55d23a4e401a777a16e948cc49d48d6c72f5e.tar.gz android_packages_apps_Trebuchet-87d55d23a4e401a777a16e948cc49d48d6c72f5e.tar.bz2 android_packages_apps_Trebuchet-87d55d23a4e401a777a16e948cc49d48d6c72f5e.zip |
am 043d34c0: am 10853b92: Merge "Asset swap" into honeycomb
* commit '043d34c0959099b564327ad26b798bcdbc60d2e2':
Asset swap
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png | bin | 1502 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xlarge-mdpi/app_market_generic.png | bin | 957 -> 3549 bytes | |||
-rw-r--r-- | res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png | bin | 1215 -> 1919 bytes | |||
-rw-r--r-- | res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png | bin | 1546 -> 2478 bytes | |||
-rw-r--r-- | res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png | bin | 1430 -> 0 bytes | |||
-rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge-land/launcher.xml | 20 | ||||
-rw-r--r-- | res/layout-xlarge-port/all_apps_tabbed.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge-port/launcher.xml | 25 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 9 |
10 files changed, 31 insertions, 27 deletions
diff --git a/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png b/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png Binary files differdeleted file mode 100644 index 6c94a31ed..000000000 --- a/res/drawable-xlarge-hdpi/ic_home_configure_holo_dark.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/app_market_generic.png b/res/drawable-xlarge-mdpi/app_market_generic.png Binary files differindex c093e2425..355ea6a54 100644 --- a/res/drawable-xlarge-mdpi/app_market_generic.png +++ b/res/drawable-xlarge-mdpi/app_market_generic.png diff --git a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png Binary files differindex d3ab3ad1a..7f0458998 100644 --- a/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png +++ b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png diff --git a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png Binary files differindex 0261d0db8..04749e6f4 100644 --- a/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-xlarge-mdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png b/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png Binary files differdeleted file mode 100644 index 8a992739d..000000000 --- a/res/drawable-xlarge-mdpi/ic_home_configure_holo_dark.png +++ /dev/null diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index fbe98b09e..d03a57158 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -54,7 +54,7 @@ <com.android.launcher2.DeleteZone android:id="@+id/all_apps_delete_zone" android:text="@string/delete_zone_label_all_apps" - android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawablePadding="@dimen/delete_zone_drawable_padding" android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index c76516e15..957327ebf 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -75,13 +75,13 @@ android:id="@+id/search_divider" android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_divider_height" + android:layout_height="match_parent" android:layout_toRightOf="@id/search_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:onClick="onClickAllAppsButton" - android:focusable="true" + android:onClick="onClickSearchButton" + android:focusable="false" android:clickable="true" /> <!-- Voice search icon --> @@ -120,26 +120,26 @@ android:id="@+id/divider" android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_divider_height" + android:layout_height="match_parent" android:layout_toLeftOf="@id/configure_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" android:onClick="onClickAllAppsButton" - android:focusable="true" + android:focusable="false" android:clickable="true" /> <TextView android:id="@+id/all_apps_button" android:text="@string/all_apps_button_label" - android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawablePadding="@dimen/all_apps_button_drawable_padding" android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/divider" android:paddingLeft="@dimen/toolbar_button_horizontal_padding" android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:paddingTop="@dimen/all_apps_button_vertical_padding" + android:paddingBottom="@dimen/all_apps_button_vertical_padding" android:background="@drawable/button_bg" android:gravity="center_horizontal|center_vertical" @@ -158,7 +158,7 @@ android:id="@+id/divider_during_drag" android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_divider_height" + android:layout_height="match_parent" android:layout_toLeftOf="@id/configure_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" @@ -166,7 +166,7 @@ <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:text="@string/delete_zone_label_workspace" - android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawablePadding="@dimen/delete_zone_drawable_padding" android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index b90041c6b..269fa1275 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -54,7 +54,7 @@ <com.android.launcher2.DeleteZone android:id="@+id/all_apps_delete_zone" android:text="@string/delete_zone_label_all_apps" - android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawablePadding="@dimen/delete_zone_drawable_padding" android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index 3b499d9a8..a8087f450 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -46,7 +46,7 @@ android:id="@+id/all_apps_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="top"/> + android:layout_gravity="top" /> <RelativeLayout android:id="@+id/all_apps_button_cluster" @@ -75,13 +75,13 @@ android:id="@+id/search_divider" android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_divider_height" + android:layout_height="match_parent" android:layout_toRightOf="@id/search_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:onClick="onClickAllAppsButton" - android:focusable="true" + android:onClick="onClickSearchButton" + android:focusable="false" android:clickable="true" /> <!-- Voice search icon --> @@ -111,6 +111,7 @@ android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:background="@drawable/button_bg" android:onClick="onClickConfigureButton" android:focusable="true" @@ -119,26 +120,27 @@ android:id="@+id/divider" android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_divider_height" + android:layout_height="match_parent" android:layout_toLeftOf="@id/configure_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" android:onClick="onClickAllAppsButton" - android:focusable="true" + android:focusable="false" android:clickable="true" /> <TextView android:id="@+id/all_apps_button" android:text="@string/all_apps_button_label" - android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawablePadding="@dimen/all_apps_button_drawable_padding" android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toLeftOf="@id/divider" android:paddingLeft="@dimen/toolbar_button_horizontal_padding" android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:paddingTop="@dimen/all_apps_button_vertical_padding" + android:paddingBottom="@dimen/all_apps_button_vertical_padding" + android:background="@drawable/button_bg" android:gravity="center_horizontal|center_vertical" android:textColor="#CCFFFFFF" @@ -156,7 +158,7 @@ android:id="@+id/divider_during_drag" android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="@dimen/toolbar_divider_height" + android:layout_height="match_parent" android:layout_toLeftOf="@id/configure_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" @@ -164,7 +166,7 @@ <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:text="@string/delete_zone_label_workspace" - android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawablePadding="@dimen/delete_zone_drawable_padding" android:drawableLeft="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -173,6 +175,7 @@ android:paddingRight="@dimen/toolbar_button_horizontal_padding" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:background="@drawable/button_bg" android:gravity="center_horizontal|center_vertical" android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 22f4134c5..c4988e42e 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -42,10 +42,11 @@ <dimen name="customizeSmallScreenVerticalMarginLandscape">90dip</dimen> <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen> - <dimen name="all_apps_drawable_padding">8dip</dimen> - <!-- toolbar divider height is 32dip plus 2*8dip for padding on top and bottom --> - <dimen name="toolbar_divider_height">48dip</dimen> - <dimen name="toolbar_button_vertical_padding">8dip</dimen> + <dimen name="delete_zone_drawable_padding">8dip</dimen> + <dimen name="all_apps_button_drawable_padding">0dip</dimen> + <dimen name="all_apps_button_vertical_padding">4dip</dimen> + + <dimen name="toolbar_button_vertical_padding">12dip</dimen> <dimen name="toolbar_button_horizontal_padding">16dip</dimen> <!-- height & width of the drop rectangle for the trash icon --> |