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

6 files changed, 209 insertions, 97 deletions

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 40b579b..8892134 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -55,6 +55,18 @@
         android:layout_marginRight="5dip"
         android:layout_marginTop="15dip"
         android:scaleType="center"/>
+
+	<ImageView
+	    android:id="@+id/last_picture_button"
+		android:layout_width="75dip"
+		android:layout_height="75dip"
+		android:clickable="true"
+		android:focusable="true"
+		android:focusableInTouchMode="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="10dip"
+        android:layout_marginBottom="10dip"/>
     
     <TextView
             android:id="@+id/hint_toast"
@@ -66,44 +78,5 @@
             android:gravity="center"
             android:text="@string/camera_button_hint"
             android:textSize="18sp"/>
-
-    <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/post_picture_panel"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:paddingLeft="7dip"
-            android:paddingRight="7dip"
-            android:paddingTop="6dip"
-            android:paddingBottom="6dip"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-        <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"
-        />
-    </LinearLayout>
 </RelativeLayout>
 
diff --git a/res/layout/detailsview.xml b/res/layout/detailsview.xml
index 21cac08..e28f06c 100644
--- a/res/layout/detailsview.xml
+++ b/res/layout/detailsview.xml
@@ -23,8 +23,8 @@
 		android:orientation="vertical"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:paddingLeft="10dip"
-		android:paddingRight="10dip"
+		android:paddingLeft="5dip"
+		android:paddingRight="5dip"
 		android:paddingBottom="10dp">
 		
 		<LinearLayout
@@ -32,11 +32,18 @@
 			android:gravity="center_vertical"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content">
-			
-			<ImageView
-				android:id="@+id/details_thumbnail_image"
-				android:layout_width="64dip"
-				android:layout_height="64dip"/>
+
+			<LinearLayout
+			    android:orientation="horizontal"
+			    android:gravity="center_vertical"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+                android:background="@drawable/detail_photo_border">
+			    <ImageView
+				    android:id="@+id/details_thumbnail_image"
+				    android:layout_width="64dip"
+				    android:layout_height="64dip"/>
+		    </LinearLayout>
 
 		    <TextView
 		    	android:id="@+id/details_image_title"
@@ -51,15 +58,16 @@
 		<TableLayout
 		    android:layout_width="fill_parent"
 		    android:layout_height="wrap_content"
+		    android:paddingLeft="5dip"
 		    android:layout_marginTop="10dip">
 		
 		    <TableRow>
 		        <TextView
-				    android:id="@+id/details_attrname_1"
 				    android:gravity="right"
-				    android:textAppearance="?android:attr/textAppearanceSmall" />
+				    android:textAppearance="?android:attr/textAppearanceSmall" 
+				    android:text="@string/details_file_size"/>
 		        <TextView
-		            android:id="@+id/details_attrvalu_1"
+		            android:id="@+id/details_file_size_value"
 		            android:textAppearance="?android:attr/textAppearanceSmall"
 		            android:paddingLeft="5dip"
 		            android:textColor="?android:attr/textColorPrimary"/>
@@ -67,24 +75,86 @@
 		
 		    <TableRow>
 		        <TextView
-		            android:id="@+id/details_attrname_2"
 		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"/>
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_image_resolution"/>
 		        <TextView
-		            android:id="@+id/details_attrvalu_2"
+		            android:id="@+id/details_resolution_value"
+        	   	    android:layout_height="wrap_content" 
+			   	    android:layout_width="fill_parent"
 		            android:textAppearance="?android:attr/textAppearanceSmall"
 		            android:paddingLeft="5dip"
 		            android:textColor="?android:attr/textColorPrimary"/>
 		    </TableRow>
-		
 		    <TableRow
-		    	android:id="@+id/details_daterow">
+		    	android:id="@+id/details_duration_row">
 		        <TextView
-		            android:id="@+id/details_attrname_3"
 		            android:gravity="right"
-		            android:textAppearance="?android:attr/textAppearanceSmall"/>
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_duration"/>
+		        <TextView
+		            android:id="@+id/details_duration_value"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:paddingLeft="5dip"
+		            android:textColor="?android:attr/textColorPrimary"/>
+		    </TableRow>
+		    <TableRow
+		    	android:id="@+id/details_frame_rate_row">
+		        <TextView
+		            android:gravity="right"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_frame_rate"/>
+		        <TextView
+		            android:id="@+id/details_frame_rate_value"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:paddingLeft="5dip"
+		            android:textColor="?android:attr/textColorPrimary"/>
+		    </TableRow>
+		    
+		    <TableRow
+		    	android:id="@+id/details_bit_rate_row">
+		        <TextView
+		            android:gravity="right"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_bit_rate"/>
+		        <TextView
+		            android:id="@+id/details_bit_rate_value"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:paddingLeft="5dip"
+		            android:textColor="?android:attr/textColorPrimary"/>
+		    </TableRow>
+		    <TableRow
+		    	android:id="@+id/details_format_row">
+		        <TextView
+		            android:gravity="right"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_format"/>
+		        <TextView
+		            android:id="@+id/details_format_value"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:paddingLeft="5dip"
+		            android:textColor="?android:attr/textColorPrimary"/>
+		    </TableRow>
+		    <TableRow
+		    	android:id="@+id/details_codec_row">
+		        <TextView
+		            android:gravity="right"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_codec"/>
+		        <TextView
+		            android:id="@+id/details_codec_value"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:paddingLeft="5dip"
+		            android:textColor="?android:attr/textColorPrimary"/>
+		    </TableRow>
+		    <TableRow
+		    	android:id="@+id/details_date_taken_row">
+		        <TextView
+		            android:gravity="right"
+		            android:textAppearance="?android:attr/textAppearanceSmall"
+		            android:text="@string/details_date_taken"/>
 		        <TextView
-		            android:id="@+id/details_attrvalu_3"
+		            android:id="@+id/details_date_taken_value"
 		            android:textAppearance="?android:attr/textAppearanceSmall"
 		            android:paddingLeft="5dip"
 		            android:textColor="?android:attr/textColorPrimary"/>
diff --git a/res/layout/gallery_picker_item.xml b/res/layout/gallery_picker_item.xml
index 5536dad..62d8333 100644
--- a/res/layout/gallery_picker_item.xml
+++ b/res/layout/gallery_picker_item.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.
@@ -14,30 +14,25 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="160dp" android:paddingTop="0dip"
-    android:paddingBottom="0dip" android:paddingLeft="0dip"
-    android:layout_height="wrap_content">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="148dp"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal">
 
-    <LinearLayout android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal">
+    <com.android.camera.GalleryPickerItem android:id="@+id/thumbnail"
+        android:layout_width="142dip"
+        android:layout_height="142dip"
+        android:scaleType="centerCrop" />
 
-        <com.android.camera.GalleryPickerItem android:id="@+id/thumbnail"
-            android:layout_width="142dip" 
-            android:layout_height="142dip"
-            android:scaleType="centerCrop" />
-
-        <TextView android:id="@+id/title"
-        	android:paddingTop="3dip"
-        	android:paddingBottom="9dip"
-            android:layout_width="wrap_content"
-            android:textSize="14sp" 
-            android:maxLines="2" 
-            android:textColor="#ffffffff"
-            android:ellipsize="end"
-            android:layout_height="wrap_content" />
+    <TextView android:id="@+id/title"
+        android:paddingTop="3dip"
+        android:paddingBottom="9dip"
+        android:layout_width="wrap_content"
+        android:textSize="14sp"
+        android:singleLine="true"
+        android:textColor="#ffffffff"
+        android:ellipsize="middle"
+        android:layout_height="wrap_content" />
 
-	</LinearLayout>
-</FrameLayout>
+</LinearLayout>
diff --git a/res/layout/gallerypicker.xml b/res/layout/gallerypicker.xml
index fd6f40a..2227989 100644
--- a/res/layout/gallerypicker.xml
+++ b/res/layout/gallerypicker.xml
@@ -14,19 +14,14 @@
      limitations under the License.
 -->
 
-<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/root"
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/albums"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="#000000">
-    
-    <GridView android:id="@+id/albums"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" 
-            android:paddingTop="2dip"
-	        android:numColumns="auto_fit"
-    	    android:columnWidth="148dp"
-        	android:stretchMode="spacingWidthUniform"
-            android:drawSelectorOnTop="false" />
-
-</AbsoluteLayout>
-
+    android:paddingTop="2dip"
+    android:numColumns="auto_fit"
+    android:columnWidth="148dp"
+    android:stretchMode="spacingWidthUniform"
+    android:drawSelectorOnTop="false"
+    android:cacheColorHint="#000000"
+    android:background="#000000"/>
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index bd84d3d..652b354 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -107,6 +107,14 @@
 			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"
@@ -130,6 +138,22 @@
 			android:text="@string/camera_toss"
 			style="@style/OnscreenActionIcon"
 		/>
+		<com.android.camera.ActionMenuButton
+			android:id="@+id/accept"
+			android:drawableTop="@drawable/ic_menu_share"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/camera_accept"
+			style="@style/OnscreenActionIcon"
+		/>
+		<com.android.camera.ActionMenuButton
+			android:id="@+id/cancel"
+			android:drawableTop="@drawable/ic_menu_delete"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/camera_cancel"
+			style="@style/OnscreenActionIcon"
+		/>
 	</LinearLayout>
 </RelativeLayout>
 
diff --git a/res/layout/viewimage.xml b/res/layout/viewimage.xml
index de042f1..e27bd7c 100644
--- a/res/layout/viewimage.xml
+++ b/res/layout/viewimage.xml
@@ -76,6 +76,61 @@
 		</view>
 	</AbsoluteLayout>
 	
+    <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_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="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/camera_capture"
+            style="@style/OnscreenActionIcon"
+        />
+        <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"
+        />
+    </LinearLayout>
+	
 	<ImageView android:id="@+id/prev_image"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:layout_alignParentLeft="true"