New position indicators and icons for Launcher2.
Change-Id: Id444943a3cc2e9db78733614141cbe2be837fdbf
diff --git a/res/drawable-hdpi/all_apps_button_focused.png b/res/drawable-hdpi/all_apps_button_focused.png
new file mode 100644
index 0000000..5860c70
--- /dev/null
+++ b/res/drawable-hdpi/all_apps_button_focused.png
Binary files differ
diff --git a/res/drawable-hdpi/all_apps_button_normal.png b/res/drawable-hdpi/all_apps_button_normal.png
index c29d3d7..3ebdbb4 100644
--- a/res/drawable-hdpi/all_apps_button_normal.png
+++ b/res/drawable-hdpi/all_apps_button_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/all_apps_button_pressed.png b/res/drawable-hdpi/all_apps_button_pressed.png
index 4c64d69..b8bb7a8 100644
--- a/res/drawable-hdpi/all_apps_button_pressed.png
+++ b/res/drawable-hdpi/all_apps_button_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/home_button_focused.png b/res/drawable-hdpi/home_button_focused.png
index 392bc66..08b1fcb 100644
--- a/res/drawable-hdpi/home_button_focused.png
+++ b/res/drawable-hdpi/home_button_focused.png
Binary files differ
diff --git a/res/drawable-hdpi/home_button_normal.png b/res/drawable-hdpi/home_button_normal.png
index 40fbbfd..4afcce8 100644
--- a/res/drawable-hdpi/home_button_normal.png
+++ b/res/drawable-hdpi/home_button_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/home_button_pressed.png b/res/drawable-hdpi/home_button_pressed.png
index 392bc66..aa91732 100644
--- a/res/drawable-hdpi/home_button_pressed.png
+++ b/res/drawable-hdpi/home_button_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_1_focus.png b/res/drawable-hdpi/ic_home_arrows_1_focus.png
new file mode 100644
index 0000000..4574682
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_1_focus.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_1_focus_right.png b/res/drawable-hdpi/ic_home_arrows_1_focus_right.png
new file mode 100644
index 0000000..454afce
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_1_focus_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_1_normal.png b/res/drawable-hdpi/ic_home_arrows_1_normal.png
new file mode 100644
index 0000000..88ce15f
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_1_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_1_normal_right.png b/res/drawable-hdpi/ic_home_arrows_1_normal_right.png
new file mode 100644
index 0000000..dd39d9b
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_1_normal_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_1_press.png b/res/drawable-hdpi/ic_home_arrows_1_press.png
new file mode 100644
index 0000000..93e0ea5
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_1_press.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_1_press_right.png b/res/drawable-hdpi/ic_home_arrows_1_press_right.png
new file mode 100644
index 0000000..be141bc
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_1_press_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_2_focus.png b/res/drawable-hdpi/ic_home_arrows_2_focus.png
new file mode 100644
index 0000000..cbcaf40
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_2_focus.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_2_focus_right.png b/res/drawable-hdpi/ic_home_arrows_2_focus_right.png
new file mode 100644
index 0000000..0f50482
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_2_focus_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_2_normal.png b/res/drawable-hdpi/ic_home_arrows_2_normal.png
new file mode 100644
index 0000000..9337c1c
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_2_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_2_normal_right.png b/res/drawable-hdpi/ic_home_arrows_2_normal_right.png
new file mode 100644
index 0000000..646437f
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_2_normal_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_2_press.png b/res/drawable-hdpi/ic_home_arrows_2_press.png
new file mode 100644
index 0000000..e9daab2
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_2_press.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_2_press_right.png b/res/drawable-hdpi/ic_home_arrows_2_press_right.png
new file mode 100644
index 0000000..8565fc8
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_2_press_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_3_focus.png b/res/drawable-hdpi/ic_home_arrows_3_focus.png
new file mode 100644
index 0000000..45b26bc
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_3_focus.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_3_focus_right.png b/res/drawable-hdpi/ic_home_arrows_3_focus_right.png
new file mode 100644
index 0000000..1c045fe
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_3_focus_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_3_normal.png b/res/drawable-hdpi/ic_home_arrows_3_normal.png
new file mode 100644
index 0000000..56e4978
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_3_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_3_normal_right.png b/res/drawable-hdpi/ic_home_arrows_3_normal_right.png
new file mode 100644
index 0000000..ef9114b
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_3_normal_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_3_press.png b/res/drawable-hdpi/ic_home_arrows_3_press.png
new file mode 100644
index 0000000..9e9c6cb
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_3_press.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_3_press_right.png b/res/drawable-hdpi/ic_home_arrows_3_press_right.png
new file mode 100644
index 0000000..f3ac1d2
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_3_press_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_4_focus.png b/res/drawable-hdpi/ic_home_arrows_4_focus.png
new file mode 100644
index 0000000..b7e4980
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_4_focus.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_4_focus_right.png b/res/drawable-hdpi/ic_home_arrows_4_focus_right.png
new file mode 100644
index 0000000..7f4857e
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_4_focus_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_4_normal.png b/res/drawable-hdpi/ic_home_arrows_4_normal.png
new file mode 100644
index 0000000..9cdf519
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_4_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_4_normal_right.png b/res/drawable-hdpi/ic_home_arrows_4_normal_right.png
new file mode 100644
index 0000000..de67f17
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_4_normal_right.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_4_press.png b/res/drawable-hdpi/ic_home_arrows_4_press.png
new file mode 100644
index 0000000..3ff701d
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_4_press.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_arrows_4_press_right.png b/res/drawable-hdpi/ic_home_arrows_4_press_right.png
new file mode 100644
index 0000000..33fcc7b
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_arrows_4_press_right.png
Binary files differ
diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png
index 8d3d8e4..712fc6f 100644
--- a/res/drawable-hdpi/trashcan.png
+++ b/res/drawable-hdpi/trashcan.png
Binary files differ
diff --git a/res/drawable-hdpi/trashcan_hover.png b/res/drawable-hdpi/trashcan_hover.png
index 59f2741..9d7131e 100644
--- a/res/drawable-hdpi/trashcan_hover.png
+++ b/res/drawable-hdpi/trashcan_hover.png
Binary files differ
diff --git a/res/drawable/all_apps_button.xml b/res/drawable/all_apps_button.xml
index 985bdff..9f6b8ac 100644
--- a/res/drawable/all_apps_button.xml
+++ b/res/drawable/all_apps_button.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/all_apps_button_pressed" />
- <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/all_apps_button_pressed" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/all_apps_button_focused" />
<item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/all_apps_button_normal" />
<item android:drawable="@drawable/all_apps_button_normal" />
</selector>
diff --git a/res/drawable/home_arrows_left.xml b/res/drawable/home_arrows_left.xml
new file mode 100644
index 0000000..82df258
--- /dev/null
+++ b/res/drawable/home_arrows_left.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:maxLevel="0" android:drawable="@android:color/transparent" />
+ <item android:maxLevel="1" android:drawable="@drawable/home_arrows_left_1" />
+ <item android:maxLevel="2" android:drawable="@drawable/home_arrows_left_2" />
+ <item android:maxLevel="3" android:drawable="@drawable/home_arrows_left_3" />
+ <item android:maxLevel="4" android:drawable="@drawable/home_arrows_left_4" />
+</level-list>
diff --git a/res/drawable/home_arrows_left_1.xml b/res/drawable/home_arrows_left_1.xml
new file mode 100644
index 0000000..f61f39e
--- /dev/null
+++ b/res/drawable/home_arrows_left_1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_1_press" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_1_focus" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_1_normal" />
+ <item android:drawable="@drawable/ic_home_arrows_1_normal" />
+</selector>
diff --git a/res/drawable/home_arrows_left_2.xml b/res/drawable/home_arrows_left_2.xml
new file mode 100644
index 0000000..888a258
--- /dev/null
+++ b/res/drawable/home_arrows_left_2.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_2_press" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_2_focus" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_2_normal" />
+ <item android:drawable="@drawable/ic_home_arrows_2_normal" />
+</selector>
diff --git a/res/drawable/home_arrows_left_3.xml b/res/drawable/home_arrows_left_3.xml
new file mode 100644
index 0000000..4dbdf15
--- /dev/null
+++ b/res/drawable/home_arrows_left_3.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_3_press" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_3_focus" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_3_normal" />
+ <item android:drawable="@drawable/ic_home_arrows_3_normal" />
+</selector>
diff --git a/res/drawable/home_arrows_left_4.xml b/res/drawable/home_arrows_left_4.xml
new file mode 100644
index 0000000..31b381d
--- /dev/null
+++ b/res/drawable/home_arrows_left_4.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_4_press" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_4_focus" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_4_normal" />
+ <item android:drawable="@drawable/ic_home_arrows_4_normal" />
+</selector>
diff --git a/res/drawable/home_arrows_right.xml b/res/drawable/home_arrows_right.xml
new file mode 100644
index 0000000..8ab0dec
--- /dev/null
+++ b/res/drawable/home_arrows_right.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<level-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:maxLevel="0" android:drawable="@drawable/home_arrows_right_4" />
+ <item android:maxLevel="1" android:drawable="@drawable/home_arrows_right_3" />
+ <item android:maxLevel="2" android:drawable="@drawable/home_arrows_right_2" />
+ <item android:maxLevel="3" android:drawable="@drawable/home_arrows_right_1" />
+ <item android:maxLevel="4" android:drawable="@android:color/transparent" />
+</level-list>
diff --git a/res/drawable/home_arrows_right_1.xml b/res/drawable/home_arrows_right_1.xml
new file mode 100644
index 0000000..f49b760
--- /dev/null
+++ b/res/drawable/home_arrows_right_1.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_1_press_right" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_1_focus_right" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_1_normal_right" />
+ <item android:drawable="@drawable/ic_home_arrows_1_normal_right" />
+</selector>
diff --git a/res/drawable/home_arrows_right_2.xml b/res/drawable/home_arrows_right_2.xml
new file mode 100644
index 0000000..17318a3
--- /dev/null
+++ b/res/drawable/home_arrows_right_2.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_2_press_right" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_2_focus_right" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_2_normal_right" />
+ <item android:drawable="@drawable/ic_home_arrows_2_normal_right" />
+</selector>
diff --git a/res/drawable/home_arrows_right_3.xml b/res/drawable/home_arrows_right_3.xml
new file mode 100644
index 0000000..375f8e3
--- /dev/null
+++ b/res/drawable/home_arrows_right_3.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_3_press_right" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_3_focus_right" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_3_normal_right" />
+ <item android:drawable="@drawable/ic_home_arrows_3_normal_right" />
+</selector>
diff --git a/res/drawable/home_arrows_right_4.xml b/res/drawable/home_arrows_right_4.xml
new file mode 100644
index 0000000..06627c6
--- /dev/null
+++ b/res/drawable/home_arrows_right_4.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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/ic_home_arrows_4_press_right" />
+ <item android:state_focused="true" android:state_window_focused="true" android:drawable="@drawable/ic_home_arrows_4_focus_right" />
+ <item android:state_focused="true" android:state_window_focused="false" android:drawable="@drawable/ic_home_arrows_4_normal_right" />
+ <item android:drawable="@drawable/ic_home_arrows_4_normal_right" />
+</selector>
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index d3069a1..e5fb6fb 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -40,8 +40,6 @@
android:id="@+id/workspace"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:scrollbars="horizontal"
- android:fadeScrollbars="true"
launcher:defaultScreen="2">
<include android:id="@+id/cell1" layout="@layout/workspace_screen" />
@@ -52,9 +50,37 @@
</com.android.launcher2.Workspace>
+ <ImageView
+ android:id="@+id/previous_screen"
+ android:layout_width="53dip"
+ android:layout_height="@dimen/button_bar_height"
+ android:layout_gravity="bottom|left"
+ android:layout_marginLeft="6dip"
+
+ android:src="@drawable/home_arrows_left"
+
+ android:onClick="previousScreen"
+
+ android:focusable="true"
+ android:clickable="true" />
+
+ <ImageView
+ android:id="@+id/next_screen"
+ android:layout_width="53dip"
+ android:layout_height="@dimen/button_bar_height"
+ android:layout_gravity="bottom|right"
+ android:layout_marginRight="6dip"
+
+ android:src="@drawable/home_arrows_right"
+
+ android:onClick="nextScreen"
+
+ android:focusable="true"
+ android:clickable="true" />
+
<com.android.launcher2.HandleView
android:id="@+id/all_apps_button"
- android:layout_width="fill_parent"
+ android:layout_width="wrap_content"
android:layout_height="@dimen/button_bar_height"
android:layout_gravity="bottom|center_horizontal"
@@ -68,8 +94,8 @@
<com.android.launcher2.DeleteZone
android:id="@+id/delete_zone"
- android:layout_width="fill_parent"
- android:layout_height="49dip"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/button_bar_height"
android:layout_gravity="bottom|center_horizontal"
android:scaleType="center"
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 73901d3..51e3f25 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -17,31 +17,15 @@
package com.android.launcher2;
import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Paint;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.PorterDuff;
-import android.os.Vibrator;
-import android.os.SystemClock;
import android.util.AttributeSet;
-import android.util.Log;
import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
import android.view.KeyEvent;
-import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
/**
* A ViewGroup that coordinated dragging across its dscendants
*/
public class DragLayer extends FrameLayout {
- private static final String TAG = "Launcher.DragLayer";
-
DragController mDragController;
/**
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index be1ee67..738793b 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -65,11 +65,11 @@
import android.widget.EditText;
import android.widget.TextView;
import android.widget.Toast;
+import android.widget.ImageView;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProviderInfo;
import java.util.ArrayList;
-import java.util.Map.Entry;
import java.util.HashMap;
import java.io.DataOutputStream;
import java.io.FileNotFoundException;
@@ -550,10 +550,10 @@
mHandleView = (HandleView) findViewById(R.id.all_apps_button);
mHandleView.setLauncher(this);
mHandleView.setOnClickListener(this);
- /* TODO
- TransitionDrawable handleIcon = (TransitionDrawable) mHandleView.getDrawable();
- handleIocon.setCrossFadeEnabled(true);
- */
+
+ Drawable previous = ((ImageView) dragLayer.findViewById(R.id.previous_screen)).getDrawable();
+ Drawable next = ((ImageView) dragLayer.findViewById(R.id.next_screen)).getDrawable();
+ mWorkspace.setIndicators(previous, next);
workspace.setOnLongClickListener(this);
workspace.setDragController(dragController);
@@ -572,6 +572,16 @@
dragController.addDropTarget(deleteZone);
}
+ @SuppressWarnings({"UnusedDeclaration"})
+ public void previousScreen(View v) {
+ mWorkspace.scrollLeft();
+ }
+
+ @SuppressWarnings({"UnusedDeclaration"})
+ public void nextScreen(View v) {
+ mWorkspace.scrollRight();
+ }
+
/**
* Creates a view representing a shortcut.
*
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index a14a11f..d7b20fb 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -108,6 +108,9 @@
int mDrawerContentHeight;
int mDrawerContentWidth;
+ private Drawable mPreviousIndicator;
+ private Drawable mNextIndicator;
+
/**
* Used to inflate the Workspace from XML.
*
@@ -462,6 +465,8 @@
postInvalidate();
} else if (mNextScreen != INVALID_SCREEN) {
mCurrentScreen = Math.max(0, Math.min(mNextScreen, getChildCount() - 1));
+ mPreviousIndicator.setLevel(mCurrentScreen);
+ mNextIndicator.setLevel(mCurrentScreen);
Launcher.setScreen(mCurrentScreen);
mNextScreen = INVALID_SCREEN;
clearChildrenCache();
@@ -543,14 +548,6 @@
if (restore) {
canvas.restoreToCount(restoreCount);
}
-
- onDrawScrollBars(canvas);
- }
-
- @Override
- protected int computeHorizontalScrollRange() {
- final int count = getChildCount();
- return count == 0 ? getWidth() : (getChildAt(count - 1)).getRight();
}
private float mScale = 1.0f;
@@ -794,7 +791,6 @@
void enableChildrenCache(int fromScreen, int toScreen) {
if (fromScreen > toScreen) {
- int temp = fromScreen;
fromScreen = toScreen;
toScreen = fromScreen;
}
@@ -805,7 +801,6 @@
toScreen = Math.min(toScreen, count - 1);
for (int i = fromScreen; i <= toScreen; i++) {
- // Log.d("TAG", "enablingChildrenCache: " + i);
final CellLayout layout = (CellLayout) getChildAt(i);
layout.setChildrenDrawnWithCacheEnabled(true);
layout.setChildrenDrawingCacheEnabled(true);
@@ -1392,6 +1387,13 @@
getChildAt(mDefaultScreen).requestFocus();
}
+ void setIndicators(Drawable previous, Drawable next) {
+ mPreviousIndicator = previous;
+ mNextIndicator = next;
+ previous.setLevel(mCurrentScreen);
+ next.setLevel(mCurrentScreen);
+ }
+
public static class SavedState extends BaseSavedState {
int currentScreen = -1;
