Code drop from //branches/cupcake/...@124589

8 files changed, 244 insertions, 287 deletions

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 1bd5a14..40b579b 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -19,7 +19,7 @@
         android:layout_height="fill_parent"
         android:orientation="horizontal">
 
-    <SurfaceView
+    <com.android.camera.VideoPreview
             android:id="@+id/camera_preview"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
@@ -27,10 +27,10 @@
             />
           
     <ImageView
-    		android:id="@+id/blackout"
-    		android:layout_width="fill_parent"
-    		android:layout_height="fill_parent"
-    		android:visibility="invisible" 
+            android:id="@+id/blackout"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:visibility="invisible" 
     />
 
     <ImageView
@@ -42,77 +42,68 @@
         android:layout_alignParentTop="true"
         android:layout_marginRight="6dip"
         android:layout_marginTop="6dip"
+        android:scaleType="center"
+        android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/mode_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_camera_indicator_photo"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="5dip"
+        android:layout_marginTop="15dip"
         android:scaleType="center"/>
     
     <TextView
-    		android:id="@+id/hint_toast"
-    		android:layout_alignParentRight="true"
-    	    android:layout_alignParentTop="true"
-	    	android:background="@drawable/popup_camera_toast"
+            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:visibility="visible"/>
+            android:textSize="18sp"/>
 
-	<AbsoluteLayout 
-	    	android:background="#CC666666"
-			android:visibility="invisible"
-			android:id="@+id/post_picture_panel"
-    		android:layout_width="fill_parent" 
-    		android:layout_height="wrap_content" 
-   			android:layout_centerHorizontal="true"
+    <LinearLayout
+            android:visibility="gone"
+            android:id="@+id/post_picture_panel"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="false">
-        <View android:layout_width="fill_parent"
-            android:layout_height="1dip"
-            android:background="@android:drawable/divider_horizontal_dark" />
-        <LinearLayout 
-        		android:paddingLeft="7dip"
-        		android:paddingRight="7dip"
-        		android:paddingTop="6dip"
-        		android:paddingBottom="6dip"
-        		android:layout_width="fill_parent" 
-        		android:layout_height="wrap_content" 
-       			android:background="#00000000"
-        		android:orientation="horizontal">
-    	    <Button
-                android:id="@+id/save"
-                android:textSize="18sp"
-                android:drawableTop="@android:drawable/ic_menu_save"
-                android:layout_width="112dip"
-                android:layout_height="wrap_content"
-                android:text="@string/camera_keep"
-            />
-            <View android:layout_width="6dip" android:layout_height="6dip" />
-            <Button
-                android:id="@+id/setas"
-                android:textSize="18sp"
-                android:drawableTop="@android:drawable/ic_menu_set_as"
-                android:layout_width="112dip"
-                android:layout_height="wrap_content"
-                android:text="@string/camera_set"
-            />
-            <View android:layout_width="6dip" android:layout_height="6dip" />
-    	    <Button
-                android:id="@+id/share"
-                android:textSize="18sp"
-                android:drawableTop="@android:drawable/ic_menu_share"
-                android:layout_width="112dip"
-                android:layout_height="wrap_content"
-            	android:text="@string/camera_share"
-            />
-            <View android:layout_width="6dip" android:layout_height="6dip" />
-            <Button
-            	android:id="@+id/discard"
-                android:textSize="18sp"
-                android:drawableTop="@android:drawable/ic_menu_delete"
-            	android:layout_width="112dip"
-            	android:layout_height="wrap_content"
-                android:text="@string/camera_toss"
-            />
-        </LinearLayout>
-    </AbsoluteLayout>
+            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/gallerypicker.xml b/res/layout/gallerypicker.xml
index 42dbc7e..fd6f40a 100644
--- a/res/layout/gallerypicker.xml
+++ b/res/layout/gallerypicker.xml
@@ -24,8 +24,8 @@
             android:layout_height="fill_parent" 
             android:paddingTop="2dip"
 	        android:numColumns="auto_fit"
-    	    android:columnWidth="160dp"
-        	android:stretchMode="spacingWidth"
+    	    android:columnWidth="148dp"
+        	android:stretchMode="spacingWidthUniform"
             android:drawSelectorOnTop="false" />
 
 </AbsoluteLayout>
diff --git a/res/layout/gallerysettings.xml b/res/layout/gallerysettings.xml
deleted file mode 100644
index b513813..0000000
--- a/res/layout/gallerysettings.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/scroll_view"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#1C1C1C">
-    
-    <LinearLayout android:id="@+id/layout"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-        android:paddingTop="30dip"
-	    android:orientation="vertical">
-
-        <LinearLayout android:orientation="horizontal"
-                      android:layout_width="fill_parent"
-                      android:layout_height="50dip">
-            <TextView
-                android:layout_height="wrap_content"
-                android:textColor="#FFFFFFFF"
-                android:layout_width="0dip"
-                android:textSize="10sp"
-                android:layout_weight="50"
-                android:gravity="right"
-                android:singleLine="false"
-                android:text="@string/gallerysettings_duration" />
-
-            <Spinner android:id="@+id/slide_show_speed"
-                android:layout_width="0dip"
-                android:layout_weight="50"
-                android:layout_marginRight="10dip"
-                android:layout_marginLeft="20dip"
-                android:layout_height="wrap_content">
-            </Spinner>
-
-        </LinearLayout>
-
-        <Button android:id="@+id/done"
-            android:layout_width="80dip"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="70dip"
-            android:layout_marginRight="10dip"
-            android:gravity="bottom"
-            android:layout_gravity="right"
-            android:text="@string/camerasettings_done" />
-
-    </LinearLayout>
-</ScrollView>
-
diff --git a/res/layout/image_gallery.xml b/res/layout/image_gallery.xml
deleted file mode 100644
index d4b9db6..0000000
--- a/res/layout/image_gallery.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/root"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <GridView 
-    	android:id="@+id/grid"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:padding="12dp"
-        android:verticalSpacing="8dp"
-        android:horizontalSpacing="8dp"
-        android:stretchMode="spacingWidth"
-        android:gravity="center"
-        android:drawSelectorOnTop="false"
-        android:listSelector="@drawable/grid_background"
-        android:numColumns="auto_fit"
-        android:columnWidth="64dp"
-        android:fadingEdge="none"
-    />
-
-    <TextView android:id="@+id/NoImageView"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:text="@string/image_gallery_NoImageView_text"
-        android:textColor="#FFFFFFFF"
-    />
-</AbsoluteLayout>
-
diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml
new file mode 100644
index 0000000..6344d8b
--- /dev/null
+++ b/res/layout/movie_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent" 
+    android:layout_height="fill_parent">
+
+    <VideoView 
+     android:id="@+id/surface_view" 
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_centerInParent="true"
+    />
+
+    <LinearLayout android:id="@+id/progress_indicator"
+        android:orientation="vertical"
+        android:layout_centerInParent="true"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content">
+
+        <ProgressBar android:id="@android:id/progress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_gravity="center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView android:paddingTop="5dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/loading_video" android:textSize="14sp"
+            android:textColor="#ffffffff" />
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
new file mode 100644
index 0000000..bd84d3d
--- /dev/null
+++ b/res/layout/video_camera.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal">
+
+    <com.android.camera.VideoPreview
+            android:id="@+id/camera_preview"
+            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" 
+    />
+
+    <ImageView
+        android:id="@+id/mode_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_camera_indicator_video"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="5dip"
+        android:layout_marginTop="15dip"
+        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"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="15dip"
+        android:layout_marginTop="15dip"
+        android:scaleType="center"
+        android:visibility="gone"/>
+
+    <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:paddingRight="2dip"
+        android:shadowColor="#c0000000"
+        android:shadowDx="1"
+        android:shadowDy="1"
+        android:shadowRadius="1"
+        android:gravity="right"
+        android:textColor="#ffffffff"
+        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_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/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"
+		/>
+	</LinearLayout>
+</RelativeLayout>
+
diff --git a/res/layout/viewvideo.xml b/res/layout/viewvideo.xml
deleted file mode 100644
index 49af24b..0000000
--- a/res/layout/viewvideo.xml
+++ /dev/null
@@ -1,28 +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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#FF000000"
-    >
-
-    <VideoView android:id="@+id/video"
-        android:layout_centerInParent="true"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-</RelativeLayout>
-
diff --git a/res/layout/youtube_upload_info.xml b/res/layout/youtube_upload_info.xml
deleted file mode 100644
index fa62a77..0000000
--- a/res/layout/youtube_upload_info.xml
+++ /dev/null
@@ -1,82 +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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
->
-	<LinearLayout
-    android:orientation="vertical" 
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-
-
-    <TextView android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/upload_info_title"
-        android:textSize="12sp" />
-
-    <EditText android:id="@+id/video_title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" android:autoText="true"
-        android:capitalize="words" android:textSize="12sp" />
-
-    <TextView android:layout_width="wrap_content"
-        android:layout_height="wrap_content" android:paddingTop="10dip"
-        android:text="@string/details_category_label"
-        android:textSize="12sp" />
-
-    <Spinner android:id="@+id/category"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:drawSelectorOnTop="false" android:textSize="12sp" />
-
-    <TextView android:id="@+id/tags_label"
-        android:layout_width="fill_parent" android:paddingTop="10dip"
-        android:layout_height="wrap_content"
-        android:text="@string/upload_info_tags" android:textSize="12sp" />
-
-    <EditText android:id="@+id/video_tags"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" android:textSize="12sp"
-        android:autoText="false" android:capitalize="none" />
-
-    <TextView android:layout_width="fill_parent"
-        android:paddingTop="10dip" android:layout_height="wrap_content"
-        android:text="@string/upload_info_description"
-        android:textSize="12sp" />
-
-    <EditText android:id="@+id/video_description"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" android:autoText="true"
-        android:capitalize="sentences" android:textSize="12sp" />
-
-    <LinearLayout android:orientation="horizontal"
-        android:layout_width="fill_parent" android:paddingTop="10dip"
-        android:layout_height="wrap_content">
-
-        <CheckBox android:id="@+id/public_or_private"
-            android:layout_width="0dip" android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:text="@string/upload_info_private" />
-
-        <Button android:id="@+id/do_upload"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/upload_info_upload" />
-    </LinearLayout>
-</LinearLayout>
-</ScrollView>