UI refresh for attachment capture mode.

5 files changed, 127 insertions, 79 deletions

diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml
new file mode 100644
index 0000000..8cbbf98
--- /dev/null
+++ b/res/layout/attach_camera_control.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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:id="@+id/control_bar"
+        android:layout_height="fill_parent"
+        android:layout_width="wrap_content"
+        android:layout_marginRight="4dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="10dp"
+        android:layout_alignParentRight="true">
+    <LinearLayout android:orientation="vertical"
+            android:gravity="top|center_horizontal"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content">
+        <LinearLayout android:orientation="vertical"
+                android:layout_marginBottom="15dp"
+                android:gravity="top|center_horizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content">
+            <ImageView android:id="@+id/btn_cancel"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:scaleType="center"
+                    android:clickable="true"
+                    android:focusable="false"
+                    android:src="@drawable/btn_ic_review_cancel"
+                    android:background="@drawable/btn_camera_review"/>
+            <TextView android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:textSize="12sp"
+                    android:text="@string/camera_cancel" />
+        </LinearLayout>
+
+        <LinearLayout android:orientation="vertical"
+                android:visibility="invisible"
+                android:gravity="top|center_horizontal"
+                android:layout_marginBottom="15dp"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content">
+            <ImageView android:id="@+id/btn_retake"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:scaleType="center"
+                    android:clickable="true"
+                    android:focusable="false"
+                    android:src="@drawable/btn_ic_review_retake_photo"
+                    android:background="@drawable/btn_camera_review"/>
+            <TextView android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:textSize="12sp"
+                    android:text="@string/camera_retake" />
+        </LinearLayout>
+        
+        <LinearLayout android:orientation="vertical"
+                android:visibility="invisible"
+                android:layout_marginBottom="15dp"
+                android:gravity="top|center_horizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content">
+            <ImageView android:id="@+id/btn_play"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:scaleType="center"
+                    android:clickable="true"
+                    android:focusable="false"
+                    android:src="@drawable/btn_ic_review_play"
+                    android:background="@drawable/btn_camera_review"/>
+            <TextView android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:textSize="12sp"
+                    android:text="@string/camera_play" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <com.android.camera.ShutterButton android:id="@+id/shutter_button"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:scaleType="center"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/btn_ic_camera_shutter"
+            android:background="@drawable/btn_shutter"/>
+
+    <LinearLayout android:orientation="vertical"
+            android:visibility="invisible"
+            android:gravity="top|center_horizontal"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content">
+        <ImageView android:id="@+id/btn_done"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:scaleType="center"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/btn_ic_review_attach"
+                android:background="@drawable/btn_camera_review"/>
+        <TextView android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:textSize="12sp"
+                android:text="@string/camera_attach" />
+    </LinearLayout>
+</RelativeLayout>
+
+
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 7fd57c7..22e77a0 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -20,8 +20,6 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 
-    <include android:id="@+id/control_bar" layout="@layout/camera_control"/>
-
     <FrameLayout android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true" 
diff --git a/res/layout/post_picture_panel.xml b/res/layout/post_picture_panel.xml
deleted file mode 100644
index 9b34dfd..0000000
--- a/res/layout/post_picture_panel.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:visibility="gone"
-    android:id="@+id/post_picture_panel"
-    android:layout_alignParentTop="true"
-    android:layout_toLeftOf="@id/button_bar"
-    android:layout_marginTop="20dp"
-    android:layout_marginRight="20dp"
-    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"
-        android:layout_marginLeft="20dp"
-        style="@style/OnscreenActionIcon"
-    />
-    <com.android.camera.ActionMenuButton
-        android:id="@+id/cancel"
-        android:drawableTop="@drawable/ic_menu_cancel"
-        android:text="@string/camera_cancel"
-        android:layout_marginLeft="20dp"
-        style="@style/OnscreenActionIcon"
-    />
-</LinearLayout>
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index 1ab2e80..ca1653a 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -21,8 +21,6 @@
         android:layout_height="fill_parent"
         android:orientation="horizontal">
 
-    <include android:id="@+id/control_bar" layout="@layout/camera_control"/>
-
     <FrameLayout android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true" 
@@ -65,37 +63,4 @@
             android:textSize="23dp"
             android:textStyle="bold"
             android:visibility="gone"/>
-
-
-    <LinearLayout
-            android:visibility="gone"
-            android:id="@+id/post_picture_panel"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@id/button_bar"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="30dp"
-            android:layout_marginLeft="30dp"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-        <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/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>
 </RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5ab7fa5..c96ec84 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -154,6 +154,9 @@
     <!-- button indicating that the the review activity should be finished -->
     <string name="camera_done">DONE</string>
 
+    <!-- button indicate the user want to retake another picture for attachment -->
+    <string name="camera_retake">RETAKE</string>
+
     <!-- button indicating that the picture just taken should be cropped -->
     <string name="camera_crop">Crop</string>