am 5eea8422: am ac465854: am d02acfb9: Merge change I2abbb876 into eclair

Merge commit '5eea8422718e415d99f360fcc5962236e1391008'

* commit '5eea8422718e415d99f360fcc5962236e1391008':
  New widgets

3 files changed, 36 insertions, 18 deletions

diff --git a/res/drawable/appwidget_inner.xml b/res/drawable/appwidget_button_center.xml
index fc7bb6d..194b357 100644
--- a/res/drawable/appwidget_inner.xml
+++ b/res/drawable/appwidget_button_center.xml
@@ -16,18 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_default" />
-
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_inner_pressed" />
+        android:drawable="@drawable/appwidget_inner_press_c" />
 
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/appwidget_inner_default" />
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_c" />
 
     <item
-         android:drawable="@drawable/appwidget_inner_default" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/appwidget_outer.xml b/res/drawable/appwidget_button_left.xml
index d6f3cb6..cbbce86 100644
--- a/res/drawable/appwidget_outer.xml
+++ b/res/drawable/appwidget_button_left.xml
@@ -16,18 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_default" />
-
     <item android:state_pressed="true"
-        android:drawable="@drawable/appwidget_outer_pressed" />
+        android:drawable="@drawable/appwidget_inner_press_l" />
 
     <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_selected" />
-
-    <item android:state_enabled="true"
-        android:drawable="@drawable/appwidget_outer_default" />
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_l" />
 
     <item
-         android:drawable="@drawable/appwidget_outer_default" />
+         android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml
new file mode 100644
index 0000000..9623f54
--- /dev/null
+++ b/res/drawable/appwidget_button_right.xml
@@ -0,0 +1,28 @@
+<?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/appwidget_inner_press_r" />
+
+    <item android:state_focused="true" android:state_enabled="true"
+        android:state_window_focused="true"
+        android:drawable="@drawable/appwidget_inner_focus_r" />
+
+    <item
+         android:drawable="@android:color/transparent" />
+</selector>