auto import from //branches/cupcake_rel/...@141571

35 files changed, 109 insertions, 103 deletions

diff --git a/res/drawable/frame_thumbnail_default.png b/res/drawable/frame_thumbnail_default.png
index a7498db..a531790 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 ebc6855..3be8138 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 429a318..5884f9c 100644
--- a/res/drawable/frame_thumbnail_selected.png
+++ b/res/drawable/frame_thumbnail_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_attach_default.png b/res/drawable/ic_btn_actionmenu_attach_default.png
index 043691d..c8f7ec7 100644
--- a/res/drawable/ic_btn_actionmenu_attach_default.png
+++ b/res/drawable/ic_btn_actionmenu_attach_default.png
diff --git a/res/drawable/ic_btn_actionmenu_attach_pressed.png b/res/drawable/ic_btn_actionmenu_attach_pressed.png
index b092ac1..7753e5b 100644
--- a/res/drawable/ic_btn_actionmenu_attach_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_attach_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_attach_selected.png b/res/drawable/ic_btn_actionmenu_attach_selected.png
index 52a2ef0..ca7e775 100644
--- a/res/drawable/ic_btn_actionmenu_attach_selected.png
+++ b/res/drawable/ic_btn_actionmenu_attach_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_cancel_default.png b/res/drawable/ic_btn_actionmenu_cancel_default.png
index cb8f7bc..ac7169a 100644
--- a/res/drawable/ic_btn_actionmenu_cancel_default.png
+++ b/res/drawable/ic_btn_actionmenu_cancel_default.png
diff --git a/res/drawable/ic_btn_actionmenu_cancel_pressed.png b/res/drawable/ic_btn_actionmenu_cancel_pressed.png
index 02bdb49..ecb1a1f 100644
--- a/res/drawable/ic_btn_actionmenu_cancel_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_cancel_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_cancel_selected.png b/res/drawable/ic_btn_actionmenu_cancel_selected.png
index a0b6017..235ee88 100644
--- a/res/drawable/ic_btn_actionmenu_cancel_selected.png
+++ b/res/drawable/ic_btn_actionmenu_cancel_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_delete_default.png b/res/drawable/ic_btn_actionmenu_delete_default.png
index 7e25f0d..f3f655e 100644
--- a/res/drawable/ic_btn_actionmenu_delete_default.png
+++ b/res/drawable/ic_btn_actionmenu_delete_default.png
diff --git a/res/drawable/ic_btn_actionmenu_delete_pressed.png b/res/drawable/ic_btn_actionmenu_delete_pressed.png
index 94087f6..14a21a8 100644
--- a/res/drawable/ic_btn_actionmenu_delete_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_delete_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_delete_selected.png b/res/drawable/ic_btn_actionmenu_delete_selected.png
index 780310b..2ddb0a6 100644
--- a/res/drawable/ic_btn_actionmenu_delete_selected.png
+++ b/res/drawable/ic_btn_actionmenu_delete_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_gallery_default.png b/res/drawable/ic_btn_actionmenu_gallery_default.png
index a2d38db..4d3456c 100644
--- a/res/drawable/ic_btn_actionmenu_gallery_default.png
+++ b/res/drawable/ic_btn_actionmenu_gallery_default.png
diff --git a/res/drawable/ic_btn_actionmenu_gallery_pressed.png b/res/drawable/ic_btn_actionmenu_gallery_pressed.png
index a01b7f8..4c29587 100644
--- a/res/drawable/ic_btn_actionmenu_gallery_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_gallery_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_gallery_selected.png b/res/drawable/ic_btn_actionmenu_gallery_selected.png
index 400a63b..27349d4 100644
--- a/res/drawable/ic_btn_actionmenu_gallery_selected.png
+++ b/res/drawable/ic_btn_actionmenu_gallery_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_play_default.png b/res/drawable/ic_btn_actionmenu_play_default.png
index 17e0748..eba780b 100644
--- a/res/drawable/ic_btn_actionmenu_play_default.png
+++ b/res/drawable/ic_btn_actionmenu_play_default.png
diff --git a/res/drawable/ic_btn_actionmenu_play_pressed.png b/res/drawable/ic_btn_actionmenu_play_pressed.png
index c671669..1caa2c2 100644
--- a/res/drawable/ic_btn_actionmenu_play_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_play_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_play_selected.png b/res/drawable/ic_btn_actionmenu_play_selected.png
index 35e1425..fea0ba0 100644
--- a/res/drawable/ic_btn_actionmenu_play_selected.png
+++ b/res/drawable/ic_btn_actionmenu_play_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_set_as_default.png b/res/drawable/ic_btn_actionmenu_set_as_default.png
index 0d341c7..048024f 100644
--- a/res/drawable/ic_btn_actionmenu_set_as_default.png
+++ b/res/drawable/ic_btn_actionmenu_set_as_default.png
diff --git a/res/drawable/ic_btn_actionmenu_set_as_pressed.png b/res/drawable/ic_btn_actionmenu_set_as_pressed.png
index 58dc85c..67ae2aa 100644
--- a/res/drawable/ic_btn_actionmenu_set_as_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_set_as_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_set_as_selected.png b/res/drawable/ic_btn_actionmenu_set_as_selected.png
index 6281229..f2e5fce 100644
--- a/res/drawable/ic_btn_actionmenu_set_as_selected.png
+++ b/res/drawable/ic_btn_actionmenu_set_as_selected.png
diff --git a/res/drawable/ic_btn_actionmenu_share_default.png b/res/drawable/ic_btn_actionmenu_share_default.png
index 19f6ef4..8e66365 100644
--- a/res/drawable/ic_btn_actionmenu_share_default.png
+++ b/res/drawable/ic_btn_actionmenu_share_default.png
diff --git a/res/drawable/ic_btn_actionmenu_share_grayout.png b/res/drawable/ic_btn_actionmenu_share_grayout.png
index f41db23..4b62023 100755
--- a/res/drawable/ic_btn_actionmenu_share_grayout.png
+++ b/res/drawable/ic_btn_actionmenu_share_grayout.png
diff --git a/res/drawable/ic_btn_actionmenu_share_pressed.png b/res/drawable/ic_btn_actionmenu_share_pressed.png
index 8583114..be71235 100644
--- a/res/drawable/ic_btn_actionmenu_share_pressed.png
+++ b/res/drawable/ic_btn_actionmenu_share_pressed.png
diff --git a/res/drawable/ic_btn_actionmenu_share_selected.png b/res/drawable/ic_btn_actionmenu_share_selected.png
index fc9679b..fd4f886 100644
--- a/res/drawable/ic_btn_actionmenu_share_selected.png
+++ b/res/drawable/ic_btn_actionmenu_share_selected.png
diff --git a/res/drawable/ic_btn_camera_default_background.png b/res/drawable/ic_btn_camera_default_background.png
index 5dac9c1..d58e2d2 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 ebc6855..e0f7e12 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 429a318..3d7549b 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_indicator_photo.png b/res/drawable/ic_camera_indicator_photo.png
index 3b0483b..d6c02da 100644
--- a/res/drawable/ic_camera_indicator_photo.png
+++ b/res/drawable/ic_camera_indicator_photo.png
diff --git a/res/drawable/ic_camera_indicator_video.png b/res/drawable/ic_camera_indicator_video.png
index a4cb8d0..c160c66 100644
--- a/res/drawable/ic_camera_indicator_video.png
+++ b/res/drawable/ic_camera_indicator_video.png
diff --git a/res/drawable/ic_gps_active_camera.png b/res/drawable/ic_gps_active_camera.png
new file mode 100755
index 0000000..9814772
--- /dev/null
+++ b/res/drawable/ic_gps_active_camera.png
diff --git a/res/drawable/ic_launcher_camera.png b/res/drawable/ic_launcher_camera.png
index 9bb4c61..c2d7606 100644
--- a/res/drawable/ic_launcher_camera.png
+++ b/res/drawable/ic_launcher_camera.png
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 02d8430..767beaa 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -4,9 +4,9 @@
      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.
@@ -25,7 +25,7 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_centerInParent="true" />
-          
+
     <com.android.camera.ShutterButton
         android:id="@+id/shutter_button"
         android:layout_width="wrap_content"
@@ -36,11 +36,24 @@
         android:focusable="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="10dip"
-        android:layout_marginTop="10dip"
+        android:layout_marginRight="5dip"
+        android:layout_marginTop="5dip"
         android:scaleType="center" />
 
     <ImageView
+            android:id="@+id/gps_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            android:clickable="false"
+            android:focusable="false"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="18dip"
+            android:layout_marginTop="18dip"
+            android:src="@drawable/ic_gps_active_camera" />
+
+    <ImageView
         android:id="@+id/focus_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -51,7 +64,7 @@
         android:layout_marginTop="16dip"
         android:scaleType="center"
         android:visibility="gone" />
-        
+
     <ImageView
         android:visibility="gone"
         android:id="@+id/last_picture_button"
@@ -61,6 +74,6 @@
         android:focusable="false"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dip"
-        android:layout_marginTop="10dip" />
+        android:layout_marginLeft="5dip"
+        android:layout_marginTop="5dip" />
 </RelativeLayout>
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index bafcd09..b8981cc 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -4,9 +4,9 @@
      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.
@@ -24,114 +24,107 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_centerInParent="true"
-            />
-          
-    <ImageView
-    		android:id="@+id/video_frame"
-    		android:layout_width="fill_parent"
-    		android:layout_height="fill_parent"
-    		android:visibility="gone" 
     />
-    
+
     <ImageView
-    		android:id="@+id/blackout"
-    		android:layout_width="fill_parent"
-    		android:layout_height="fill_parent"
-    		android:visibility="invisible" 
+            android:id="@+id/video_frame"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:visibility="gone"
     />
 
     <com.android.camera.ShutterButton
-        android:id="@+id/shutter_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_camera_indicator_video"
-	    android:background="@drawable/ic_btn_camera_background"
-        android:clickable="true"
-		android:focusable="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dip"
-        android:layout_marginTop="10dip"
-        android:scaleType="center"/>
+            android:id="@+id/shutter_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_camera_indicator_video"
+            android:background="@drawable/ic_btn_camera_background"
+            android:clickable="true"
+            android:focusable="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="5dip"
+            android:scaleType="center" />
 
     <!-- Note: In this TextView the paddingRight="2"
          attribute is required because otherwise the
          text's drop shadow will be clipped. -->
     <TextView
-        android:id="@+id/recording_time"
-        android:layout_width="90dip"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/shutter_button"
-        android:layout_alignTop="@id/shutter_button"
-        android:layout_marginTop="20dip"
-        android:layout_marginRight="6dip"
-        android:paddingRight="2dip"
-        android:shadowColor="#c0000000"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="1"
-        android:gravity="right"
-        android:textColor="@color/recording_time_elapsed_text"
-        android:textSize="20dip"
-        android:textStyle="bold"
-        android:visibility="gone"/>
+            android:id="@+id/recording_time"
+            android:layout_width="90dip"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/shutter_button"
+            android:layout_alignTop="@id/shutter_button"
+            android:layout_marginTop="20dip"
+            android:layout_marginRight="6dip"
+            android:paddingRight="2dip"
+            android:shadowColor="#c0000000"
+            android:shadowDx="1"
+            android:shadowDy="1"
+            android:shadowRadius="1"
+            android:gravity="right"
+            android:textColor="@color/recording_time_elapsed_text"
+            android:textSize="20dip"
+            android:textStyle="bold"
+            android:visibility="gone"/>
 
-	<LinearLayout
-			android:visibility="gone"
-			android:id="@+id/post_picture_panel"
-			android:layout_alignTop="@id/shutter_button"
-			android:layout_toLeftOf="@id/shutter_button"
+    <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/post_picture_panel"
+            android:layout_alignTop="@id/shutter_button"
+            android:layout_toLeftOf="@id/shutter_button"
             android:layout_marginRight="38dip"
-			android:layout_width="wrap_content" 
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
         <com.android.camera.ActionMenuButton
-            android:id="@+id/gallery"
-            android:drawableTop="@drawable/ic_menu_gallery"
-            android:text="@string/camera_gallery"
-            style="@style/OnscreenActionIcon"
+                android:id="@+id/gallery"
+                android:drawableTop="@drawable/ic_menu_gallery"
+                android:text="@string/camera_gallery"
+                style="@style/OnscreenActionIcon"
+        />
+        <com.android.camera.ActionMenuButton
+                android:id="@+id/play"
+                android:drawableTop="@drawable/ic_menu_camera_play"
+                android:text="@string/camera_play"
+                style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
-			android:id="@+id/play"
-			android:drawableTop="@drawable/ic_menu_camera_play"
-			android:text="@string/camera_play"
-			style="@style/OnscreenActionIcon"
-		/>
-		<com.android.camera.ActionMenuButton
-			android:id="@+id/share"
-			android:drawableTop="@drawable/ic_menu_share"
-			android:text="@string/camera_share"
-			style="@style/OnscreenActionIcon"
-		/>
-		<com.android.camera.ActionMenuButton
-			android:id="@+id/discard"
-			android:drawableTop="@drawable/ic_menu_delete"
-			android:text="@string/camera_toss"
-			style="@style/OnscreenActionIcon"
-		/>
-		<com.android.camera.ActionMenuButton
-			android:id="@+id/attach"
-			android:drawableTop="@drawable/ic_menu_attach"
-			android:text="@string/camera_attach"
-			style="@style/OnscreenActionIcon"
-		/>
-		<com.android.camera.ActionMenuButton
-			android:id="@+id/cancel"
-			android:drawableTop="@drawable/ic_menu_cancel"
-			android:text="@string/camera_cancel"
-			style="@style/OnscreenActionIcon"
-		/>
-	</LinearLayout>
+                android:id="@+id/share"
+                android:drawableTop="@drawable/ic_menu_share"
+                android:text="@string/camera_share"
+                style="@style/OnscreenActionIcon"
+        />
+        <com.android.camera.ActionMenuButton
+                android:id="@+id/discard"
+                android:drawableTop="@drawable/ic_menu_delete"
+                android:text="@string/camera_toss"
+                style="@style/OnscreenActionIcon"
+        />
+        <com.android.camera.ActionMenuButton
+                android:id="@+id/attach"
+                android:drawableTop="@drawable/ic_menu_attach"
+                android:text="@string/camera_attach"
+                style="@style/OnscreenActionIcon"
+        />
+        <com.android.camera.ActionMenuButton
+                android:id="@+id/cancel"
+                android:drawableTop="@drawable/ic_menu_cancel"
+                android:text="@string/camera_cancel"
+                style="@style/OnscreenActionIcon"
+        />
+    </LinearLayout>
     <ImageView
-        android:visibility="visible"
-        android:id="@+id/last_picture_button"
-        android:layout_width="72dip"
-        android:layout_height="72dip"
-        android:clickable="true"
-        android:focusable="false"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dip"
-        android:layout_marginTop="10dip" />
+            android:visibility="visible"
+            android:id="@+id/last_picture_button"
+            android:layout_width="72dip"
+            android:layout_height="72dip"
+            android:clickable="true"
+            android:focusable="false"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="5dip"
+            android:layout_marginTop="5dip"/>
 </RelativeLayout>
diff --git a/res/raw/camera_click.ogg b/res/raw/camera_click.ogg
deleted file mode 100644
index 0a769ff..0000000
--- a/res/raw/camera_click.ogg
+++ /dev/null