diff options
Diffstat (limited to 'res')
60 files changed, 61 insertions, 13 deletions
diff --git a/res/drawable-hdpi/app_market_generic.png b/res/drawable-hdpi/app_market_generic.png Binary files differdeleted file mode 100644 index 117453c..0000000 --- a/res/drawable-hdpi/app_market_generic.png +++ /dev/null diff --git a/res/drawable-hdpi/default_widget_preview_holo.9.png b/res/drawable-hdpi/default_widget_preview_holo.9.png Binary files differnew file mode 100644 index 0000000..ecf5deb --- /dev/null +++ b/res/drawable-hdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-hdpi/gardening_crosshairs.png b/res/drawable-hdpi/gardening_crosshairs.png Binary files differindex 409bb5d..5f83592 100644 --- a/res/drawable-hdpi/gardening_crosshairs.png +++ b/res/drawable-hdpi/gardening_crosshairs.png diff --git a/res/drawable-hdpi/homescreen_blue_normal_holo.9.png b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..ece2afd --- /dev/null +++ b/res/drawable-hdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-hdpi/homescreen_blue_strong_holo.9.png b/res/drawable-hdpi/homescreen_blue_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..3407107 --- /dev/null +++ b/res/drawable-hdpi/homescreen_blue_strong_holo.9.png diff --git a/res/drawable-hdpi/homescreen_green_normal_holo.9.png b/res/drawable-hdpi/homescreen_green_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..7332c3b --- /dev/null +++ b/res/drawable-hdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-hdpi/homescreen_green_strong_holo.9.png b/res/drawable-hdpi/homescreen_green_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..190c6cc --- /dev/null +++ b/res/drawable-hdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-hdpi/homescreen_large_blue.9.png b/res/drawable-hdpi/homescreen_large_blue.9.png Binary files differdeleted file mode 100644 index 416514d..0000000 --- a/res/drawable-hdpi/homescreen_large_blue.9.png +++ /dev/null diff --git a/res/drawable-hdpi/homescreen_large_blue_strong.9.png b/res/drawable-hdpi/homescreen_large_blue_strong.9.png Binary files differdeleted file mode 100644 index d7e32e7..0000000 --- a/res/drawable-hdpi/homescreen_large_blue_strong.9.png +++ /dev/null diff --git a/res/drawable-hdpi/homescreen_large_green.9.png b/res/drawable-hdpi/homescreen_large_green.9.png Binary files differdeleted file mode 100644 index 60042c2..0000000 --- a/res/drawable-hdpi/homescreen_large_green.9.png +++ /dev/null diff --git a/res/drawable-hdpi/homescreen_large_green_strong.9.png b/res/drawable-hdpi/homescreen_large_green_strong.9.png Binary files differdeleted file mode 100644 index c40b98e..0000000 --- a/res/drawable-hdpi/homescreen_large_green_strong.9.png +++ /dev/null diff --git a/res/drawable-hdpi/hotseat_scrubber_holo.9.png b/res/drawable-hdpi/hotseat_scrubber_holo.9.png Binary files differnew file mode 100644 index 0000000..78b540d --- /dev/null +++ b/res/drawable-hdpi/hotseat_scrubber_holo.9.png diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png Binary files differnew file mode 100644 index 0000000..ca495ff --- /dev/null +++ b/res/drawable-hdpi/hotseat_track_holo.9.png diff --git a/res/drawable-hdpi/ic_home_delete_holo_dark.png b/res/drawable-hdpi/ic_home_delete_holo_dark.png Binary files differdeleted file mode 100644 index 9d64278..0000000 --- a/res/drawable-hdpi/ic_home_delete_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_delete_hover_holo_dark.png b/res/drawable-hdpi/ic_home_delete_hover_holo_dark.png Binary files differdeleted file mode 100644 index 60d5b15..0000000 --- a/res/drawable-hdpi/ic_home_delete_hover_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_home_info_holo_dark.png b/res/drawable-hdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index 02df4e1..0000000 --- a/res/drawable-hdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_launcher_info_active_holo.png b/res/drawable-hdpi/ic_launcher_info_active_holo.png Binary files differnew file mode 100644 index 0000000..83ca112 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_info_normal_holo.png b/res/drawable-hdpi/ic_launcher_info_normal_holo.png Binary files differnew file mode 100644 index 0000000..25fb1ac --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-hdpi/ic_launcher_market_holo.png b/res/drawable-hdpi/ic_launcher_market_holo.png Binary files differnew file mode 100644 index 0000000..dc78251 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_market_holo.png diff --git a/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png Binary files differnew file mode 100644 index 0000000..51f0298 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png Binary files differnew file mode 100644 index 0000000..27a4b5e --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-hdpi/page_hover_left.9.png b/res/drawable-hdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index 1bf1565..0000000 --- a/res/drawable-hdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_left_holo.9.png b/res/drawable-hdpi/page_hover_left_holo.9.png Binary files differnew file mode 100644 index 0000000..0f405a5 --- /dev/null +++ b/res/drawable-hdpi/page_hover_left_holo.9.png diff --git a/res/drawable-hdpi/page_hover_right.9.png b/res/drawable-hdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index 7995f69..0000000 --- a/res/drawable-hdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-hdpi/page_hover_right_holo.9.png b/res/drawable-hdpi/page_hover_right_holo.9.png Binary files differnew file mode 100644 index 0000000..b7b4c56 --- /dev/null +++ b/res/drawable-hdpi/page_hover_right_holo.9.png diff --git a/res/drawable-hdpi/paged_view_indicator.9.png b/res/drawable-hdpi/paged_view_indicator.9.png Binary files differdeleted file mode 100644 index 9fd357a..0000000 --- a/res/drawable-hdpi/paged_view_indicator.9.png +++ /dev/null diff --git a/res/drawable-mdpi/app_market_generic.png b/res/drawable-mdpi/app_market_generic.png Binary files differdeleted file mode 100644 index 6eb5497..0000000 --- a/res/drawable-mdpi/app_market_generic.png +++ /dev/null diff --git a/res/drawable-mdpi/default_widget_preview.9.png b/res/drawable-mdpi/default_widget_preview.9.png Binary files differdeleted file mode 100644 index ed9c6ee..0000000 --- a/res/drawable-mdpi/default_widget_preview.9.png +++ /dev/null diff --git a/res/drawable-mdpi/default_widget_preview_holo.9.png b/res/drawable-mdpi/default_widget_preview_holo.9.png Binary files differnew file mode 100644 index 0000000..d8e1196 --- /dev/null +++ b/res/drawable-mdpi/default_widget_preview_holo.9.png diff --git a/res/drawable-mdpi/gardening_crosshairs.png b/res/drawable-mdpi/gardening_crosshairs.png Binary files differindex 338c832..2845fe4 100644 --- a/res/drawable-mdpi/gardening_crosshairs.png +++ b/res/drawable-mdpi/gardening_crosshairs.png diff --git a/res/drawable-mdpi/homescreen_blue_normal_holo.9.png b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..fef82bb --- /dev/null +++ b/res/drawable-mdpi/homescreen_blue_normal_holo.9.png diff --git a/res/drawable-mdpi/homescreen_blue_strong_holo.9.png b/res/drawable-mdpi/homescreen_blue_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..fdd9dbb --- /dev/null +++ b/res/drawable-mdpi/homescreen_blue_strong_holo.9.png diff --git a/res/drawable-mdpi/homescreen_green_normal_holo.9.png b/res/drawable-mdpi/homescreen_green_normal_holo.9.png Binary files differnew file mode 100644 index 0000000..dad34d8 --- /dev/null +++ b/res/drawable-mdpi/homescreen_green_normal_holo.9.png diff --git a/res/drawable-mdpi/homescreen_green_strong_holo.9.png b/res/drawable-mdpi/homescreen_green_strong_holo.9.png Binary files differnew file mode 100644 index 0000000..901bf4c --- /dev/null +++ b/res/drawable-mdpi/homescreen_green_strong_holo.9.png diff --git a/res/drawable-mdpi/homescreen_large_blue.9.png b/res/drawable-mdpi/homescreen_large_blue.9.png Binary files differdeleted file mode 100644 index 5e7e61f..0000000 --- a/res/drawable-mdpi/homescreen_large_blue.9.png +++ /dev/null diff --git a/res/drawable-mdpi/homescreen_large_green.9.png b/res/drawable-mdpi/homescreen_large_green.9.png Binary files differdeleted file mode 100644 index 2f83bac..0000000 --- a/res/drawable-mdpi/homescreen_large_green.9.png +++ /dev/null diff --git a/res/drawable-mdpi/homescreen_large_green_strong.9.png b/res/drawable-mdpi/homescreen_large_green_strong.9.png Binary files differdeleted file mode 100644 index 1e14502..0000000 --- a/res/drawable-mdpi/homescreen_large_green_strong.9.png +++ /dev/null diff --git a/res/drawable-mdpi/hotseat_scrubber_holo.9.png b/res/drawable-mdpi/hotseat_scrubber_holo.9.png Binary files differnew file mode 100644 index 0000000..8b7e109 --- /dev/null +++ b/res/drawable-mdpi/hotseat_scrubber_holo.9.png diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png Binary files differnew file mode 100644 index 0000000..a542cb7 --- /dev/null +++ b/res/drawable-mdpi/hotseat_track_holo.9.png diff --git a/res/drawable-mdpi/ic_home_delete_holo_dark.png b/res/drawable-mdpi/ic_home_delete_holo_dark.png Binary files differdeleted file mode 100644 index 647fd80..0000000 --- a/res/drawable-mdpi/ic_home_delete_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_delete_hover_holo_dark.png b/res/drawable-mdpi/ic_home_delete_hover_holo_dark.png Binary files differdeleted file mode 100644 index 06b62e2..0000000 --- a/res/drawable-mdpi/ic_home_delete_hover_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_home_info_holo_dark.png b/res/drawable-mdpi/ic_home_info_holo_dark.png Binary files differdeleted file mode 100644 index c34f443..0000000 --- a/res/drawable-mdpi/ic_home_info_holo_dark.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_launcher_info_active_holo.png b/res/drawable-mdpi/ic_launcher_info_active_holo.png Binary files differnew file mode 100644 index 0000000..d05de74 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_info_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_info_normal_holo.png b/res/drawable-mdpi/ic_launcher_info_normal_holo.png Binary files differnew file mode 100644 index 0000000..6a07cc9 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_info_normal_holo.png diff --git a/res/drawable-mdpi/ic_launcher_market_holo.png b/res/drawable-mdpi/ic_launcher_market_holo.png Binary files differnew file mode 100644 index 0000000..cacb374 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_market_holo.png diff --git a/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png Binary files differnew file mode 100644 index 0000000..244fe27 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_trashcan_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png Binary files differnew file mode 100644 index 0000000..bd5db08 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_trashcan_normal_holo.png diff --git a/res/drawable-mdpi/page_hover_left.9.png b/res/drawable-mdpi/page_hover_left.9.png Binary files differdeleted file mode 100644 index 5d5e0c8..0000000 --- a/res/drawable-mdpi/page_hover_left.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_left_holo.9.png b/res/drawable-mdpi/page_hover_left_holo.9.png Binary files differnew file mode 100644 index 0000000..b9368fb --- /dev/null +++ b/res/drawable-mdpi/page_hover_left_holo.9.png diff --git a/res/drawable-mdpi/page_hover_right.9.png b/res/drawable-mdpi/page_hover_right.9.png Binary files differdeleted file mode 100644 index 1545bfe..0000000 --- a/res/drawable-mdpi/page_hover_right.9.png +++ /dev/null diff --git a/res/drawable-mdpi/page_hover_right_holo.9.png b/res/drawable-mdpi/page_hover_right_holo.9.png Binary files differnew file mode 100644 index 0000000..53ba807 --- /dev/null +++ b/res/drawable-mdpi/page_hover_right_holo.9.png diff --git a/res/drawable/delete_zone_selector.xml b/res/drawable/delete_target_selector.xml index e2b37f4..229942e 100644 --- a/res/drawable/delete_zone_selector.xml +++ b/res/drawable/delete_target_selector.xml @@ -19,6 +19,6 @@ --> <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" /> + <item android:drawable="@drawable/ic_launcher_trashcan_normal_holo" /> + <item android:drawable="@drawable/ic_launcher_trashcan_active_holo" /> </transition> diff --git a/res/drawable/info_target_selector.xml b/res/drawable/info_target_selector.xml new file mode 100644 index 0000000..f3a7016 --- /dev/null +++ b/res/drawable/info_target_selector.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2011, 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_launcher_info_normal_holo" /> + <item android:drawable="@drawable/ic_launcher_info_active_holo" /> +</transition> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 3c5e0df..d2f52c8 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -39,6 +39,14 @@ <include android:id="@+id/cell4" layout="@layout/workspace_screen" /> <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> + + <ImageView + android:id="@+id/paged_view_indicator_track" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:scaleType="fitXY" + android:src="@drawable/hotseat_track_holo" /> <ImageView android:id="@+id/paged_view_indicator" android:layout_width="wrap_content" @@ -47,7 +55,7 @@ android:visibility="gone" android:alpha="0" android:scaleType="fitXY" - android:src="@drawable/paged_view_indicator" /> + android:src="@drawable/hotseat_scrubber_holo" /> <include layout="@layout/qsb_bar" android:id="@+id/qsb_bar" diff --git a/res/layout-large/button_bar.xml b/res/layout-large/button_bar.xml index a060761..8d7f5df 100644 --- a/res/layout-large/button_bar.xml +++ b/res/layout-large/button_bar.xml @@ -136,7 +136,7 @@ android:id="@+id/delete_zone" android:text="@string/delete_zone_label_workspace" android:drawablePadding="@dimen/delete_zone_drawable_padding" - android:drawableLeft="@drawable/delete_zone_selector" + android:drawableLeft="@drawable/delete_target_selector" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignRight="@+id/configure_button" diff --git a/res/layout-large/qsb_bar.xml b/res/layout-large/qsb_bar.xml index 421ace2..b600eda 100644 --- a/res/layout-large/qsb_bar.xml +++ b/res/layout-large/qsb_bar.xml @@ -113,7 +113,7 @@ style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_zone_selector" /> + android:drawableLeft="@drawable/delete_target_selector" /> </com.android.launcher2.DeleteDropTarget> <com.android.launcher2.InfoDropTarget @@ -125,7 +125,7 @@ style="@style/DropTargetButton" android:id="@+id/info_target_text" android:text="@string/info_target_label" - android:drawableLeft="@drawable/ic_home_info_holo_dark" /> + android:drawableLeft="@drawable/info_target_selector" /> </com.android.launcher2.InfoDropTarget> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index d2b9275..acb3b47 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -37,16 +37,25 @@ <include android:id="@+id/cell4" layout="@layout/workspace_screen" /> <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> + + <ImageView + android:id="@+id/paged_view_indicator_track" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginBottom="@dimen/button_bar_height" + android:scaleType="fitXY" + android:src="@drawable/hotseat_track_holo" /> <ImageView android:id="@+id/paged_view_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" + android:layout_marginBottom="@dimen/button_bar_height" android:visibility="gone" - android:paddingBottom="@dimen/button_bar_height" android:alpha="0" android:scaleType="fitXY" - android:src="@drawable/paged_view_indicator" /> + android:src="@drawable/hotseat_scrubber_holo" /> <include layout="@layout/qsb_bar" android:id="@+id/qsb_bar" diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index b455153..ecb10ec 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -76,6 +76,13 @@ launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" launcher:maxGap="@dimen/workspace_max_gap" /> <ImageView + android:id="@+id/paged_view_indicator_track" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:scaleType="fitXY" + android:src="@drawable/hotseat_track_holo" /> + <ImageView android:id="@+id/paged_view_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -83,7 +90,7 @@ android:visibility="gone" android:alpha="0" android:scaleType="fitXY" - android:src="@drawable/paged_view_indicator" /> + android:src="@drawable/hotseat_scrubber_holo" /> </FrameLayout> </LinearLayout> </com.android.launcher2.AppsCustomizeTabHost> diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index cb97b01..21043b4 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -74,7 +74,7 @@ style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_zone_selector" /> + android:drawableLeft="@drawable/delete_target_selector" /> </com.android.launcher2.DeleteDropTarget> <com.android.launcher2.InfoDropTarget @@ -86,7 +86,7 @@ style="@style/DropTargetButton" android:id="@+id/info_target_text" android:text="@string/info_target_label" - android:drawableLeft="@drawable/ic_home_info_holo_dark" /> + android:drawableLeft="@drawable/info_target_selector" /> </com.android.launcher2.InfoDropTarget> </LinearLayout> </com.android.launcher2.SearchDropTargetBar> diff --git a/res/values/colors.xml b/res/values/colors.xml index fd7b21c..ae73b04 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -20,8 +20,8 @@ <resources> <!-- The color tints to apply to the text and drag view when hovering over the delete target or the info target --> - <color name="delete_target_hover_tint">#D4FF3600</color> - <color name="info_target_hover_tint">#D40078FF</color> + <color name="delete_target_hover_tint">#DAFF0000</color> + <color name="info_target_hover_tint">#DA0099CC</color> <color name="window_background">#FF191919</color> <color name="grid_dark_background">#EB191919</color> |
