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

3 files changed, 60 insertions, 83 deletions

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 46eba7f..340a08c 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -32,7 +32,7 @@
 		android:visibility="invisible" />
 
     <com.android.camera.ShutterButton
-        android:id="@+id/mode_indicator"
+        android:id="@+id/shutter_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_camera_indicator_photo"
@@ -42,7 +42,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="50dip"
-        android:layout_marginTop="10dip"
+        android:layout_marginTop="12dip"
         android:scaleType="center" />
 
     <ImageView
@@ -50,33 +50,46 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_camera_indicator_auto_focus_green"
-        android:layout_alignLeft="@id/mode_indicator"
-        android:layout_alignTop="@id/mode_indicator"
+        android:layout_alignLeft="@id/shutter_button"
+        android:layout_alignTop="@id/shutter_button"
         android:layout_marginLeft="39dip"
         android:layout_marginTop="16dip"
         android:scaleType="center"
         android:visibility="gone" />
+        
+	<LinearLayout
+		android:visibility="gone"
+		android:id="@+id/post_picture_panel"
+		android:layout_alignBottom="@id/shutter_button"
+		android:layout_toLeftOf="@id/shutter_button"
+        android:layout_marginRight="27dip"
+		android:layout_width="wrap_content" 
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<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="gone"
 	    android:id="@+id/last_picture_button"
-		android:layout_width="75dip"
-		android:layout_height="75dip"
+		android:layout_width="72dip"
+		android:layout_height="72dip"
 		android:clickable="true"
 		android:focusable="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="10dip"
-        android:layout_marginBottom="10dip" />
-    
-    <TextView
-		android:id="@+id/hint_toast"
-		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"
-		android:background="@drawable/popup_camera_toast"
-		android:layout_width="200dip"
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:text="@string/camera_button_hint"
-		android:textSize="18sp" />
+		android:layout_alignTop="@id/shutter_button"
+		android:layout_toLeftOf="@id/shutter_button"
+        android:layout_marginRight="20dip" />
 </RelativeLayout>
 
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 0ffaf5a..e853e02 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -40,8 +40,8 @@
     		android:visibility="invisible" 
     />
 
-    <ImageView
-        android:id="@+id/mode_indicator"
+    <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"
@@ -50,7 +50,7 @@
 		android:focusable="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="50dip"
+        android:layout_marginRight="55dip"
         android:layout_marginTop="10dip"
         android:scaleType="center"/>
 
@@ -61,8 +61,8 @@
         android:id="@+id/recording_time"
         android:layout_width="90dip"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/mode_indicator"
-        android:layout_alignTop="@id/mode_indicator"
+        android:layout_toLeftOf="@id/shutter_button"
+        android:layout_alignTop="@id/shutter_button"
         android:layout_marginTop="20dip"
         android:layout_marginRight="6dip"
         android:paddingRight="2dip"
@@ -75,25 +75,13 @@
         android:textSize="20dip"
         android:textStyle="bold"
         android:visibility="gone"/>
-        
-    <TextView
-    		android:id="@+id/hint_toast"
-    		android:layout_alignParentRight="true"
-    	    android:layout_alignParentTop="true"
-	    	android:background="@drawable/popup_camera_toast"
-            android:layout_width="200dip"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/video_camera_button_hint"
-            android:textSize="18sp"/>
 
 	<LinearLayout
 			android:visibility="gone"
 			android:id="@+id/post_picture_panel"
-			android:layout_alignTop="@id/mode_indicator"
-			android:layout_toLeftOf="@id/mode_indicator"
-			android:paddingLeft="7dip"
-			android:paddingRight="15dip"
+			android:layout_alignTop="@id/shutter_button"
+			android:layout_toLeftOf="@id/shutter_button"
+            android:layout_marginRight="27dip"
 			android:layout_width="wrap_content" 
 			android:layout_height="wrap_content"
 			android:orientation="horizontal">
@@ -101,40 +89,30 @@
 		<com.android.camera.ActionMenuButton
 			android:id="@+id/play"
 			android:drawableTop="@drawable/ic_menu_camera_play"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
 			android:text="@string/camera_play"
 			style="@style/OnscreenActionIcon"
 		/>
 		<com.android.camera.ActionMenuButton
 			android:id="@+id/share"
 			android:drawableTop="@drawable/ic_menu_share"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
 			android:text="@string/camera_share"
 			style="@style/OnscreenActionIcon"
 		/>
 		<com.android.camera.ActionMenuButton
 			android:id="@+id/discard"
 			android:drawableTop="@drawable/ic_menu_delete"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
 			android:text="@string/camera_toss"
 			style="@style/OnscreenActionIcon"
 		/>
 		<com.android.camera.ActionMenuButton
 			android:id="@+id/attach"
 			android:drawableTop="@drawable/ic_menu_attach"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
 			android:text="@string/camera_attach"
 			style="@style/OnscreenActionIcon"
 		/>
 		<com.android.camera.ActionMenuButton
 			android:id="@+id/cancel"
 			android:drawableTop="@drawable/ic_menu_cancel"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
 			android:text="@string/camera_cancel"
 			style="@style/OnscreenActionIcon"
 		/>
diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml
index 6ba66d1..8d52ea1 100644
--- a/res/layout/viewimage.xml
+++ b/res/layout/viewimage.xml
@@ -76,15 +76,27 @@
 		</view>
 	</AbsoluteLayout>
 	
+	<ImageView
+        android:visibility="gone"
+		android:id="@+id/shutter_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:src="@drawable/ic_camera_indicator_photo"
+		android:background="@drawable/ic_btn_camera_background"
+		android:clickable="true"
+		android:focusable="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="50dip"
+        android:layout_marginTop="12dip"
+		android:scaleType="center"/>
+	
     <LinearLayout
             android:visibility="gone"
             android:id="@+id/action_icon_panel"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentRight="true"
-            android:paddingLeft="7dip"
-            android:paddingRight="18dip"
-            android:paddingTop="6dip"
-            android:paddingBottom="6dip"
+			android:layout_alignBottom="@id/shutter_button"
+			android:layout_toLeftOf="@id/shutter_button"
+            android:layout_marginRight="27dip"
             android:layout_width="wrap_content" 
             android:layout_height="wrap_content"
             android:orientation="horizontal">
@@ -92,66 +104,40 @@
         <com.android.camera.ActionMenuButton
             android:id="@+id/gallery"
             android:drawableTop="@drawable/ic_menu_gallery"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:text="@string/camera_gallery"
             style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
             android:id="@+id/setas"
             android:drawableTop="@drawable/ic_menu_set_as"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:text="@string/camera_set"
             style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
             android:id="@+id/share"
             android:drawableTop="@drawable/ic_menu_share"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:text="@string/camera_share"
             style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
             android:id="@+id/discard"
             android:drawableTop="@drawable/ic_menu_delete"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
             android:text="@string/camera_toss"
             style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
             android:id="@+id/attach"
             android:drawableTop="@drawable/ic_menu_attach"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:text="@string/camera_attach"
             style="@style/OnscreenActionIcon"
         />
         <com.android.camera.ActionMenuButton
             android:id="@+id/cancel"
             android:drawableTop="@drawable/ic_menu_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:text="@string/camera_cancel"
             style="@style/OnscreenActionIcon"
         />
-        <ImageView
-			android:id="@+id/mode_indicator"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:src="@drawable/ic_camera_indicator_photo"
-			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="15dip"
-			android:scaleType="center"/>
     </LinearLayout>
-	
 	<ImageView android:id="@+id/prev_image"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:layout_alignParentLeft="true"