diff options
Diffstat (limited to 'res')
23 files changed, 129 insertions, 82 deletions
diff --git a/res/drawable-hdpi/focused_application_background.9.png b/res/drawable-hdpi/focused_application_background.9.png Binary files differindex 01c83c37f..7bf37efed 100644 --- a/res/drawable-hdpi/focused_application_background.9.png +++ b/res/drawable-hdpi/focused_application_background.9.png diff --git a/res/drawable-hdpi/pressed_application_background.9.png b/res/drawable-hdpi/pressed_application_background.9.png Binary files differindex c7d0bd400..291af0226 100644 --- a/res/drawable-hdpi/pressed_application_background.9.png +++ b/res/drawable-hdpi/pressed_application_background.9.png diff --git a/res/drawable-mdpi/focused_application_background.9.png b/res/drawable-mdpi/focused_application_background.9.png Binary files differindex 341a80b47..17ee6ea1b 100644 --- a/res/drawable-mdpi/focused_application_background.9.png +++ b/res/drawable-mdpi/focused_application_background.9.png diff --git a/res/drawable-mdpi/pressed_application_background.9.png b/res/drawable-mdpi/pressed_application_background.9.png Binary files differindex 4b00eec8c..b09f595b7 100644 --- a/res/drawable-mdpi/pressed_application_background.9.png +++ b/res/drawable-mdpi/pressed_application_background.9.png diff --git a/res/drawable-xlarge-hdpi/all_apps_button_normal.9.png b/res/drawable-xlarge-hdpi/all_apps_button_normal.9.png Binary files differdeleted file mode 100644 index 8aea26e5f..000000000 --- a/res/drawable-xlarge-hdpi/all_apps_button_normal.9.png +++ /dev/null diff --git a/res/drawable-xlarge-hdpi/all_apps_button_pressed.9.png b/res/drawable-xlarge-hdpi/all_apps_button_pressed.9.png Binary files differdeleted file mode 100644 index 587f1f1aa..000000000 --- a/res/drawable-xlarge-hdpi/all_apps_button_pressed.9.png +++ /dev/null diff --git a/res/drawable-xlarge-hdpi/configure_button_normal.png b/res/drawable-xlarge-hdpi/configure_button_normal.png Binary files differdeleted file mode 100644 index 48ae0b297..000000000 --- a/res/drawable-xlarge-hdpi/configure_button_normal.png +++ /dev/null diff --git a/res/drawable-xlarge-hdpi/configure_button_pressed.png b/res/drawable-xlarge-hdpi/configure_button_pressed.png Binary files differdeleted file mode 100644 index 54dea70fd..000000000 --- a/res/drawable-xlarge-hdpi/configure_button_pressed.png +++ /dev/null diff --git a/res/drawable-xlarge-hdpi/info_button.png b/res/drawable-xlarge-hdpi/info_button.png Binary files differdeleted file mode 100644 index e9ed1b12f..000000000 --- a/res/drawable-xlarge-hdpi/info_button.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png b/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png Binary files differdeleted file mode 100644 index a42314584..000000000 --- a/res/drawable-xlarge-mdpi/all_apps_button_normal.9.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png b/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png Binary files differdeleted file mode 100644 index 5dbe77c77..000000000 --- a/res/drawable-xlarge-mdpi/all_apps_button_pressed.9.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/configure_button_normal.png b/res/drawable-xlarge-mdpi/configure_button_normal.png Binary files differdeleted file mode 100644 index 9b37efff7..000000000 --- a/res/drawable-xlarge-mdpi/configure_button_normal.png +++ /dev/null diff --git a/res/drawable-xlarge-mdpi/configure_button_pressed.png b/res/drawable-xlarge-mdpi/configure_button_pressed.png Binary files differdeleted file mode 100644 index 5f38db600..000000000 --- a/res/drawable-xlarge-mdpi/configure_button_pressed.png +++ /dev/null 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 differnew file mode 100644 index 000000000..d3ab3ad1a --- /dev/null +++ b/res/drawable-xlarge-mdpi/ic_home_add_holo_dark.png diff --git a/res/drawable-xlarge-mdpi/info_button.png b/res/drawable-xlarge-mdpi/info_button.png Binary files differdeleted file mode 100644 index 253cdf74b..000000000 --- a/res/drawable-xlarge-mdpi/info_button.png +++ /dev/null diff --git a/res/drawable-xlarge/all_apps_button.xml b/res/drawable-xlarge/all_apps_button.xml deleted file mode 100644 index 46bc63203..000000000 --- a/res/drawable-xlarge/all_apps_button.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/all_apps_button_pressed" /> - <item android:drawable="@drawable/all_apps_button_normal" /> -</selector> diff --git a/res/drawable-xlarge/configure_button.xml b/res/drawable-xlarge/configure_button.xml deleted file mode 100644 index ac8729034..000000000 --- a/res/drawable-xlarge/configure_button.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/configure_button_pressed" /> - <item android:drawable="@drawable/configure_button_normal" /> -</selector> diff --git a/res/drawable-xlarge/delete_zone_selector.xml b/res/drawable-xlarge/delete_zone_selector.xml new file mode 100644 index 000000000..e2b37f4dc --- /dev/null +++ b/res/drawable-xlarge/delete_zone_selector.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2007, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<transition xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@drawable/ic_home_delete_holo_dark" /> + <item android:drawable="@drawable/ic_home_delete_hover_holo_dark" /> +</transition> diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index bb30c11a0..e1a37ff14 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -39,7 +39,7 @@ android:layout_centerVertical="true"> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/all_apps_info_target" - android:src="@drawable/info_button" + android:src="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index e421e0793..5c58a69aa 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -105,26 +105,47 @@ <ImageView android:id="@+id/configure_button" - android:src="@drawable/configure_button" + android:src="@drawable/ic_home_add_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_marginLeft="@dimen/toolbar_button_spacing" - android:layout_marginRight="@dimen/toolbar_button_spacing" + 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:background="@drawable/button_bg" android:onClick="onClickConfigureButton" android:focusable="true" android:clickable="true" /> + <ImageView + android:id="@+id/divider" + android:src="@drawable/divider_launcher_holo" + android:layout_width="wrap_content" + android:layout_height="@dimen/toolbar_divider_height" + 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:clickable="true" /> <TextView android:id="@+id/all_apps_button" android:text="@string/all_apps_button_label" - android:background="@drawable/all_apps_button" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/configure_button" - android:layout_marginLeft="@dimen/toolbar_button_spacing" - android:layout_marginRight="@dimen/toolbar_button_spacing" + 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:background="@drawable/button_bg" + + android:gravity="center_horizontal|center_vertical" android:textColor="#CCFFFFFF" android:textSize="18sp" @@ -136,23 +157,41 @@ android:onClick="onClickAllAppsButton" android:focusable="true" android:clickable="true" /> - + <ImageView + 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_toLeftOf="@id/configure_button" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" + android:visibility="gone"/> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:src="@drawable/delete_zone_selector" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_alignRight="@id/all_apps_button" + 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:background="@drawable/button_bg" android:visibility="gone" launcher:direction="horizontal" /> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/info_button" - android:src="@drawable/info_button" + android:src="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_alignLeft="@id/configure_button" + 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:background="@drawable/button_bg" android:visibility="gone" android:focusable="true" diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index 557163432..a59314834 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -39,7 +39,7 @@ android:layout_centerVertical="true"> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/all_apps_info_target" - android:src="@drawable/info_button" + android:src="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index d9839da76..7bc318cbc 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -105,28 +105,47 @@ <ImageView android:id="@+id/configure_button" - android:src="@drawable/configure_button" + android:src="@drawable/ic_home_add_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_marginLeft="@dimen/toolbar_button_spacing" - android:layout_marginRight="@dimen/toolbar_button_spacing" + 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:onClick="onClickConfigureButton" android:focusable="true" android:clickable="true" /> + <ImageView + android:id="@+id/divider" + android:src="@drawable/divider_launcher_holo" + android:layout_width="wrap_content" + android:layout_height="@dimen/toolbar_divider_height" + 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:clickable="true" /> <TextView android:id="@+id/all_apps_button" android:text="@string/all_apps_button_label" - android:background="@drawable/all_apps_button" + android:drawablePadding="@dimen/all_apps_drawable_padding" + android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/configure_button" - android:layout_marginLeft="@dimen/toolbar_button_spacing" - android:layout_marginRight="@dimen/toolbar_button_spacing" + 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:gravity="center_horizontal|center_vertical" android:textColor="#CCFFFFFF" - android:textSize="18dp" + android:textSize="18sp" android:shadowColor="#A0000000" android:shadowDx="0.0" @@ -136,36 +155,39 @@ android:onClick="onClickAllAppsButton" android:focusable="true" android:clickable="true" /> - - <!-- The button to bring up the installed app market. - The icon for this button will be dynamically set. --> <ImageView - android:id="@+id/market_button" + android:id="@+id/divider_during_drag" + android:src="@drawable/divider_launcher_holo" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignLeft="@id/all_apps_button" - - android:onClick="onClickAppMarketButton" - android:focusable="false" - android:clickable="false" + android:layout_height="@dimen/toolbar_divider_height" + android:layout_toLeftOf="@id/configure_button" + android:paddingTop="@dimen/toolbar_button_vertical_padding" + android:paddingBottom="@dimen/toolbar_button_vertical_padding" android:visibility="gone"/> - <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:src="@drawable/delete_zone_selector" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_alignRight="@id/all_apps_button" + 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:visibility="gone" launcher:direction="horizontal" /> <com.android.launcher2.ApplicationInfoDropTarget android:id="@+id/info_button" - android:src="@drawable/info_button" + android:src="@drawable/ic_home_info_holo_dark" android:layout_width="wrap_content" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:layout_alignLeft="@id/configure_button" + 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:visibility="gone" android:focusable="true" diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 89722e466..972215a44 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -42,9 +42,11 @@ <dimen name="customizeSmallScreenVerticalMarginLandscape">90dip</dimen> <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen> - <dimen name="toolbar_padding">10dip</dimen> - - <dimen name="toolbar_button_spacing">20dip</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="toolbar_button_horizontal_padding">16dip</dimen> <!-- height & width of the drop rectangle for the trash icon --> <dimen name="delete_zone_size">50dip</dimen> |
