auto import from //branches/cupcake/...@130745

14 files changed, 6 insertions, 29 deletions

diff --git a/res/drawable/btn_camera_arrow_left.xml b/res/drawable/btn_camera_arrow_left.xml
index 9d7dcdd..494899b 100644
--- a/res/drawable/btn_camera_arrow_left.xml
+++ b/res/drawable/btn_camera_arrow_left.xml
@@ -16,12 +16,12 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false"
-        android:drawable="@drawable/btn_camera_arrow_left_default" />
-
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_camera_arrow_left_press" />
 
+    <item android:state_window_focused="true" android:state_focused="true"
+        android:drawable="@drawable/btn_camera_arrow_left_selected" />
+        
     <item 
         android:drawable="@drawable/btn_camera_arrow_left_default" />
 
diff --git a/res/drawable/btn_camera_arrow_left_selected.png b/res/drawable/btn_camera_arrow_left_selected.png
new file mode 100644
index 0000000..839704f
--- /dev/null
+++ b/res/drawable/btn_camera_arrow_left_selected.png
diff --git a/res/drawable/btn_camera_arrow_right.xml b/res/drawable/btn_camera_arrow_right.xml
index cc6ee2d..1d0cc0c 100644
--- a/res/drawable/btn_camera_arrow_right.xml
+++ b/res/drawable/btn_camera_arrow_right.xml
@@ -16,12 +16,13 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_window_focused="false"
-        android:drawable="@drawable/btn_camera_arrow_right_default" />
 
     <item android:state_pressed="true"
         android:drawable="@drawable/btn_camera_arrow_right_press" />
 
+    <item android:state_window_focused="true" android:state_focused="true"
+        android:drawable="@drawable/btn_camera_arrow_right_selected" />
+
     <item 
         android:drawable="@drawable/btn_camera_arrow_right_default" />
 
diff --git a/res/drawable/btn_camera_arrow_right_selected.png b/res/drawable/btn_camera_arrow_right_selected.png
new file mode 100644
index 0000000..630a606
--- /dev/null
+++ b/res/drawable/btn_camera_arrow_right_selected.png
diff --git a/res/drawable/frame_thumbnail_default.png b/res/drawable/frame_thumbnail_default.png
index 50f2ecf..3db932e 100644
--- a/res/drawable/frame_thumbnail_default.png
+++ b/res/drawable/frame_thumbnail_default.png
diff --git a/res/drawable/frame_thumbnail_pressed.png b/res/drawable/frame_thumbnail_pressed.png
index f46ad06..b15aea7 100644
--- a/res/drawable/frame_thumbnail_pressed.png
+++ b/res/drawable/frame_thumbnail_pressed.png
diff --git a/res/drawable/frame_thumbnail_selected.png b/res/drawable/frame_thumbnail_selected.png
index 2d32aa2..408b14a 100644
--- a/res/drawable/frame_thumbnail_selected.png
+++ b/res/drawable/frame_thumbnail_selected.png
diff --git a/res/drawable/ic_btn_camera_default_background.png b/res/drawable/ic_btn_camera_default_background.png
index 68bdefd..c37a86e 100644
--- a/res/drawable/ic_btn_camera_default_background.png
+++ b/res/drawable/ic_btn_camera_default_background.png
diff --git a/res/drawable/ic_btn_camera_pressed_background.png b/res/drawable/ic_btn_camera_pressed_background.png
index e5543e1..8707b8a 100644
--- a/res/drawable/ic_btn_camera_pressed_background.png
+++ b/res/drawable/ic_btn_camera_pressed_background.png
diff --git a/res/drawable/ic_btn_camera_selected_background.png b/res/drawable/ic_btn_camera_selected_background.png
index 0d4ff1a..a6bbdb1 100644
--- a/res/drawable/ic_btn_camera_selected_background.png
+++ b/res/drawable/ic_btn_camera_selected_background.png
diff --git a/res/drawable/ic_camera_bar_indicator_record_combo.xml b/res/drawable/ic_camera_bar_indicator_record_combo.xml
deleted file mode 100644
index 0b01f2e..0000000
--- a/res/drawable/ic_camera_bar_indicator_record_combo.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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_camera_bar_indicator_record_pressed" />
-    <item android:state_window_focused="true" android:state_focused="true"
-        android:drawable="@drawable/ic_camera_bar_indicator_record_selected" />
-    <item android:drawable="@drawable/ic_camera_bar_indicator_record" />
-
-</selector>
diff --git a/res/drawable/ic_camera_bar_indicator_record_pressed.png b/res/drawable/ic_camera_bar_indicator_record_pressed.png
deleted file mode 100644
index 517a973..0000000
--- a/res/drawable/ic_camera_bar_indicator_record_pressed.png
+++ /dev/null
diff --git a/res/drawable/ic_camera_bar_indicator_record_selected.png b/res/drawable/ic_camera_bar_indicator_record_selected.png
deleted file mode 100644
index 4965401..0000000
--- a/res/drawable/ic_camera_bar_indicator_record_selected.png
+++ /dev/null
diff --git a/res/drawable/popup_camera_toast.9.png b/res/drawable/popup_camera_toast.9.png
deleted file mode 100644
index c1f0c1f..0000000
--- a/res/drawable/popup_camera_toast.9.png
+++ /dev/null