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

1 files changed, 22 insertions, 27 deletions

diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 1c73b10..347305e 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -44,37 +44,42 @@
         android:id="@+id/mode_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_camera_indicator_video_combo"
+        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="15dip"
+        android:layout_marginRight="50dip"
+        android:layout_marginTop="10dip"
         android:scaleType="center"/>
     
     <ImageView
         android:id="@+id/recording_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_camera_bar_indicator_record_combo"
+        android:src="@drawable/ic_camera_bar_indicator_record"
+	    android:background="@drawable/ic_btn_camera_background"
         android:clickable="true"
 		android:focusable="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="15dip"
-        android:layout_marginTop="15dip"
+        android:layout_marginRight="50dip"
+        android:layout_marginTop="10dip"
         android:scaleType="center"
         android:visibility="gone"/>
 
+    <!-- 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_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="55dip"
-        android:layout_marginTop="11dip"
+        android:layout_toLeftOf="@id/recording_indicator"
+        android:layout_alignTop="@id/recording_indicator"
+        android:layout_marginTop="20dip"
+        android:layout_marginRight="6dip"
         android:paddingRight="2dip"
         android:shadowColor="#c0000000"
         android:shadowDx="1"
@@ -100,25 +105,15 @@
 	<LinearLayout
 			android:visibility="gone"
 			android:id="@+id/post_picture_panel"
-			android:layout_alignParentBottom="true"
-			android:layout_alignParentRight="true"
+			android:layout_alignTop="@id/mode_indicator"
+			android:layout_toLeftOf="@id/mode_indicator"
 			android:paddingLeft="7dip"
-			android:paddingRight="7dip"
-			android:paddingTop="6dip"
-			android:paddingBottom="6dip"
+			android:paddingRight="15dip"
 			android:layout_width="wrap_content" 
 			android:layout_height="wrap_content"
 			android:orientation="horizontal">
 
 		<com.android.camera.ActionMenuButton
-			android:id="@+id/capture"
-			android:drawableTop="@drawable/ic_menu_capture"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:text="@string/camera_capture"
-			style="@style/OnscreenActionIcon"
-		/>
-		<com.android.camera.ActionMenuButton
 			android:id="@+id/play"
 			android:drawableTop="@drawable/ic_menu_camera_play"
 			android:layout_width="wrap_content"
@@ -143,16 +138,16 @@
 			style="@style/OnscreenActionIcon"
 		/>
 		<com.android.camera.ActionMenuButton
-			android:id="@+id/accept"
-			android:drawableTop="@drawable/ic_menu_share"
+			android:id="@+id/attach"
+			android:drawableTop="@drawable/ic_menu_attach"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:text="@string/camera_accept"
+			android:text="@string/camera_attach"
 			style="@style/OnscreenActionIcon"
 		/>
 		<com.android.camera.ActionMenuButton
 			android:id="@+id/cancel"
-			android:drawableTop="@drawable/ic_menu_delete"
+			android:drawableTop="@drawable/ic_menu_cancel"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="@string/camera_cancel"