diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_home_all_apps_holo_dark.png | bin | 4135 -> 1385 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_launcher_clear_active_holo.png | bin | 0 -> 1181 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_launcher_clear_normal_holo.png | bin | 0 -> 1003 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_home_all_apps_holo_dark.png | bin | 1647 -> 877 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_launcher_clear_active_holo.png | bin | 0 -> 949 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_launcher_clear_normal_holo.png | bin | 0 -> 802 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_home_all_apps_holo_dark.png | bin | 5890 -> 1658 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_launcher_clear_active_holo.png | bin | 0 -> 1595 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_launcher_clear_normal_holo.png | bin | 0 -> 1392 bytes | |||
-rw-r--r-- | res/drawable/remove_target_selector.xml | 24 | ||||
-rw-r--r-- | res/drawable/uninstall_target_selector.xml (renamed from res/drawable/delete_target_selector.xml) | 0 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 11 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 8 | ||||
-rw-r--r-- | res/layout/qsb_bar.xml | 2 |
14 files changed, 34 insertions, 11 deletions
diff --git a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png Binary files differindex a0bfc0f90..18a524b1c 100644 --- a/res/drawable-hdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-hdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-hdpi/ic_launcher_clear_active_holo.png b/res/drawable-hdpi/ic_launcher_clear_active_holo.png Binary files differnew file mode 100644 index 000000000..cdd0052b3 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_clear_active_holo.png diff --git a/res/drawable-hdpi/ic_launcher_clear_normal_holo.png b/res/drawable-hdpi/ic_launcher_clear_normal_holo.png Binary files differnew file mode 100644 index 000000000..84549ff94 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher_clear_normal_holo.png diff --git a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png Binary files differindex ffc302047..23616d457 100644 --- a/res/drawable-mdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-mdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-mdpi/ic_launcher_clear_active_holo.png b/res/drawable-mdpi/ic_launcher_clear_active_holo.png Binary files differnew file mode 100644 index 000000000..2683beaa3 --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_clear_active_holo.png diff --git a/res/drawable-mdpi/ic_launcher_clear_normal_holo.png b/res/drawable-mdpi/ic_launcher_clear_normal_holo.png Binary files differnew file mode 100644 index 000000000..219f3e5cf --- /dev/null +++ b/res/drawable-mdpi/ic_launcher_clear_normal_holo.png diff --git a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png Binary files differindex 21a51ab6a..dff3e1645 100644 --- a/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png +++ b/res/drawable-xhdpi/ic_home_all_apps_holo_dark.png diff --git a/res/drawable-xhdpi/ic_launcher_clear_active_holo.png b/res/drawable-xhdpi/ic_launcher_clear_active_holo.png Binary files differnew file mode 100644 index 000000000..1a7e53ddb --- /dev/null +++ b/res/drawable-xhdpi/ic_launcher_clear_active_holo.png diff --git a/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png b/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png Binary files differnew file mode 100644 index 000000000..d4965d9f8 --- /dev/null +++ b/res/drawable-xhdpi/ic_launcher_clear_normal_holo.png diff --git a/res/drawable/remove_target_selector.xml b/res/drawable/remove_target_selector.xml new file mode 100644 index 000000000..5e071fbfa --- /dev/null +++ b/res/drawable/remove_target_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_launcher_clear_normal_holo" /> + <item android:drawable="@drawable/ic_launcher_clear_active_holo" /> +</transition> diff --git a/res/drawable/delete_target_selector.xml b/res/drawable/uninstall_target_selector.xml index 229942e3a..229942e3a 100644 --- a/res/drawable/delete_target_selector.xml +++ b/res/drawable/uninstall_target_selector.xml diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 084b1636a..a74eb14c8 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -66,6 +66,11 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> + <include layout="@layout/hotseat" + android:id="@+id/hotseat" + android:layout_width="@dimen/button_bar_height_plus_padding" + android:layout_height="match_parent" + android:layout_gravity="right" /> <include android:id="@+id/qsb_bar" layout="@layout/qsb_bar" /> @@ -76,12 +81,6 @@ android:layout_height="match_parent" android:visibility="invisible" /> - <include layout="@layout/hotseat" - android:id="@+id/hotseat" - android:layout_width="@dimen/button_bar_height_plus_padding" - android:layout_height="match_parent" - android:layout_gravity="right" /> - <include layout="@layout/workspace_cling" android:id="@+id/workspace_cling" android:layout_width="match_parent" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index b8df2ee57..062656fa2 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -60,16 +60,16 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> - <include - android:id="@+id/qsb_bar" - layout="@layout/qsb_bar" /> - <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" android:layout_height="@dimen/button_bar_height_plus_padding" android:layout_gravity="bottom" /> + <include + android:id="@+id/qsb_bar" + layout="@layout/qsb_bar" /> + <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" android:layout_width="match_parent" diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index c2179ce38..9daf7bff7 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -37,7 +37,7 @@ style="@style/DropTargetButton" android:id="@+id/delete_target_text" android:text="@string/delete_zone_label_workspace" - android:drawableLeft="@drawable/delete_target_selector" /> + android:drawableLeft="@drawable/remove_target_selector" /> </FrameLayout> <FrameLayout |