New gestures UI.

21 files changed, 69 insertions, 24 deletions

diff --git a/res/drawable/btn_circle.xml b/res/drawable/btn_add.xml
index 920801033..1345fd18a 100644
--- a/res/drawable/btn_circle.xml
+++ b/res/drawable/btn_add.xml
@@ -16,17 +16,11 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/btn_circle_normal" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/btn_circle_disable" />
+        android:drawable="@drawable/plus_normal" />
     <item android:state_pressed="true" 
-        android:drawable="@drawable/btn_circle_pressed" />
+        android:drawable="@drawable/plus_pressed" />
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/btn_circle_selected" />
+        android:drawable="@drawable/plus_selected" />
     <item android:state_enabled="true"
-        android:drawable="@drawable/btn_circle_normal" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_circle_disable_focused" />
-    <item
-         android:drawable="@drawable/btn_circle_disable" />
+        android:drawable="@drawable/plus_normal" />
 </selector>
diff --git a/res/drawable/btn_circle_disable.png b/res/drawable/btn_circle_disable.png
deleted file mode 100644
index 33b74a66c..000000000
--- a/res/drawable/btn_circle_disable.png
+++ /dev/null
diff --git a/res/drawable/btn_circle_disable_focused.png b/res/drawable/btn_circle_disable_focused.png
deleted file mode 100644
index 005ad8dca..000000000
--- a/res/drawable/btn_circle_disable_focused.png
+++ /dev/null
diff --git a/res/drawable/btn_circle_normal.png b/res/drawable/btn_circle_normal.png
deleted file mode 100644
index fc5af1c9f..000000000
--- a/res/drawable/btn_circle_normal.png
+++ /dev/null
diff --git a/res/drawable/btn_circle_pressed.png b/res/drawable/btn_circle_pressed.png
deleted file mode 100644
index 8f40afdfc..000000000
--- a/res/drawable/btn_circle_pressed.png
+++ /dev/null
diff --git a/res/drawable/btn_circle_selected.png b/res/drawable/btn_circle_selected.png
deleted file mode 100644
index c74fac227..000000000
--- a/res/drawable/btn_circle_selected.png
+++ /dev/null
diff --git a/res/drawable/btn_g.xml b/res/drawable/btn_g.xml
new file mode 100644
index 000000000..d033b438f
--- /dev/null
+++ b/res/drawable/btn_g.xml
@@ -0,0 +1,26 @@
+<?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_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/g_normal" />
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/g_pressed" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/g_selected" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/g_normal" />
+</selector>
diff --git a/res/drawable/btn_list.xml b/res/drawable/btn_list.xml
new file mode 100644
index 000000000..84a033ef8
--- /dev/null
+++ b/res/drawable/btn_list.xml
@@ -0,0 +1,26 @@
+<?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_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/list_normal" />
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/list_pressed" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/list_selected" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/list_normal" />
+</selector>
diff --git a/res/drawable/g_normal.png b/res/drawable/g_normal.png
new file mode 100644
index 000000000..2ae97036b
--- /dev/null
+++ b/res/drawable/g_normal.png
diff --git a/res/drawable/g_pressed.png b/res/drawable/g_pressed.png
new file mode 100644
index 000000000..13667dcbb
--- /dev/null
+++ b/res/drawable/g_pressed.png
diff --git a/res/drawable/g_selected.png b/res/drawable/g_selected.png
new file mode 100644
index 000000000..faed865ab
--- /dev/null
+++ b/res/drawable/g_selected.png
diff --git a/res/drawable/gestures_background.xml b/res/drawable/gestures_background.xml
index 34ec05145..59c11dc60 100755..100644
--- a/res/drawable/gestures_background.xml
+++ b/res/drawable/gestures_background.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-   Copyright (C) 2009 Romain Guy
+<!-- 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
+     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
+          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.
+     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.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/texture_paper"
-    android:tileMode="repeat" />
+<nine-patch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/gestures_frame"
+    android:dither="true" />
diff --git a/res/drawable/gestures_frame.9.png b/res/drawable/gestures_frame.9.png
new file mode 100644
index 000000000..c5f564063
--- /dev/null
+++ b/res/drawable/gestures_frame.9.png
diff --git a/res/drawable/ic_btn_round_plus.png b/res/drawable/ic_btn_round_plus.png
deleted file mode 100644
index 1ec8a956a..000000000
--- a/res/drawable/ic_btn_round_plus.png
+++ /dev/null
diff --git a/res/drawable/list_normal.png b/res/drawable/list_normal.png
new file mode 100644
index 000000000..ee05949c7
--- /dev/null
+++ b/res/drawable/list_normal.png
diff --git a/res/drawable/list_pressed.png b/res/drawable/list_pressed.png
new file mode 100644
index 000000000..8e3c68c86
--- /dev/null
+++ b/res/drawable/list_pressed.png
diff --git a/res/drawable/list_selected.png b/res/drawable/list_selected.png
new file mode 100644
index 000000000..93858f435
--- /dev/null
+++ b/res/drawable/list_selected.png
diff --git a/res/drawable/plus_normal.png b/res/drawable/plus_normal.png
new file mode 100644
index 000000000..ddc588807
--- /dev/null
+++ b/res/drawable/plus_normal.png
diff --git a/res/drawable/plus_pressed.png b/res/drawable/plus_pressed.png
new file mode 100644
index 000000000..872f092a8
--- /dev/null
+++ b/res/drawable/plus_pressed.png
diff --git a/res/drawable/plus_selected.png b/res/drawable/plus_selected.png
new file mode 100644
index 000000000..32c441f07
--- /dev/null
+++ b/res/drawable/plus_selected.png
diff --git a/res/drawable/texture_paper.jpg b/res/drawable/texture_paper.jpg
deleted file mode 100644
index 27f4fd667..000000000
--- a/res/drawable/texture_paper.jpg
+++ /dev/null