Add thumbnail and share popup for the last result.

bug:5141665

Change-Id: Idc44d33d09c8d4a30fdcef66de2d6754daf1ea82

8 files changed, 24 insertions, 36 deletions

diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index c860642..039a76d 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -50,6 +50,7 @@
                 android:visibility="gone">
             <ImageView style="@style/ReviewControlIcon"
                     android:id="@+id/btn_play"
+                    android:onClick="onPlayButtonClicked"
                     android:paddingTop="10dp"
                     android:paddingBottom="10dp"
                     android:src="@drawable/btn_ic_review_play"/>
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-w1024dp/review_control.xml
index 63415d3..659670f 100644
--- a/res/layout-w1024dp/review_control.xml
+++ b/res/layout-w1024dp/review_control.xml
@@ -28,6 +28,7 @@
             android:visibility="gone">
         <Button android:id="@+id/btn_done"
                 style="@style/ReviewControlIcon"
+                android:onClick="onDoneButtonClicked"
                 android:drawableLeft="@drawable/ic_menu_done_holo_light"
                 android:text="@string/review_ok"/>
         <ImageView
@@ -41,6 +42,7 @@
                 style="@style/ReviewControlIcon"
                 android:scaleType="center"
                 android:clickable="true"
+                android:onClick="onRetakeButtonClicked"
                 android:drawableLeft="@drawable/ic_switch_camera_holo_dark"/>
         <ImageView
                 android:layout_width="wrap_content"
@@ -49,6 +51,7 @@
     </LinearLayout>
     <LinearLayout style="@style/ReviewControlGroup">
         <Button android:id="@+id/btn_cancel"
+                android:onClick="onCancelButtonClicked"
                 style="@style/ReviewControlIcon"
                 android:drawableLeft="@drawable/ic_menu_cancel_holo_light"
                 android:text="@string/review_cancel"/>
diff --git a/res/layout-w1024dp/review_thumbnail.xml b/res/layout-w1024dp/review_thumbnail.xml
deleted file mode 100644
index d206997..0000000
--- a/res/layout-w1024dp/review_thumbnail.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<com.android.camera.ui.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/thumbnail"
-        android:layout_width="86dp"
-        android:layout_height="86dp"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginTop="@dimen/thumbnail_margin_top"
-        android:layout_marginRight="@dimen/thumbnail_margin_right"
-        android:orientation="horizontal"
-        android:clickable="true"
-        android:focusable="false"
-        android:background="@drawable/border_last_picture">
-</com.android.camera.ui.RotateImageView>
\ No newline at end of file
diff --git a/res/layout/attach_camera_control.xml b/res/layout/attach_camera_control.xml
index 10fa6f7..f97b908 100644
--- a/res/layout/attach_camera_control.xml
+++ b/res/layout/attach_camera_control.xml
@@ -34,6 +34,7 @@
                 android:layout_marginBottom="15dp">
             <ImageView style="@style/ReviewControlIcon"
                     android:id="@+id/btn_cancel"
+                    android:onClick="onCancelButtonClicked"
                     android:src="@drawable/btn_ic_review_cancel"/>
             <TextView style="@style/ReviewControlText"
                     android:text="@string/review_cancel" />
@@ -43,6 +44,7 @@
                 android:layout_marginBottom="15dp">
             <ImageView style="@style/ReviewControlIcon"
                     android:id="@+id/btn_retake"
+                    android:onClick="onRetakeButtonClicked"
                     android:src="@drawable/btn_ic_review_retake_photo"/>
             <TextView style="@style/ReviewControlText"
                     android:text="@string/review_retake" />
@@ -52,6 +54,7 @@
                 android:layout_marginBottom="15dp">
             <ImageView style="@style/ReviewControlIcon"
                     android:id="@+id/btn_play"
+                    android:onClick="onPlayButtonClicked"
                     android:src="@drawable/btn_ic_review_play"/>
             <TextView style="@style/ReviewControlText"
                     android:text="@string/review_play" />
@@ -71,6 +74,7 @@
             android:layout_centerHorizontal="true">
         <ImageView style="@style/ReviewControlIcon"
                 android:id="@+id/btn_done"
+                android:onClick="onDoneButtonClicked"
                 android:src="@drawable/btn_ic_review_done"/>
         <TextView style="@style/ReviewControlText"
                 android:text="@string/review_ok" />
diff --git a/res/layout/review_thumbnail.xml b/res/layout/review_thumbnail.xml
index 0593307..08cf276 100644
--- a/res/layout/review_thumbnail.xml
+++ b/res/layout/review_thumbnail.xml
@@ -16,11 +16,8 @@
 
 <com.android.camera.ui.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/thumbnail"
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:orientation="vertical"
+        style="@style/ReviewThumbnail"
+        android:onClick="onThumbnailClicked"
         android:clickable="true"
         android:focusable="false"
         android:background="@drawable/border_last_picture">
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index e16173e..dcf61f3 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -18,8 +18,6 @@
 */
 -->
 <resources>
-    <dimen name="thumbnail_margin_top">8dp</dimen>
-    <dimen name="thumbnail_margin_right">28dp</dimen>
     <dimen name="mode_switcher_margin_right">5dp</dimen>
     <dimen name="mode_switcher_margin_bottom">21dp</dimen>
     <dimen name="mode_switcher_inner_margin">10dp</dimen>
diff --git a/res/values-w1024dp/styles.xml b/res/values-w1024dp/styles.xml
index f75819b..b7e0055 100644
--- a/res/values-w1024dp/styles.xml
+++ b/res/values-w1024dp/styles.xml
@@ -33,4 +33,12 @@
         <item name="android:paddingRight">15dp</item>
         <item name="android:background">@drawable/btn_review_control</item>
     </style>
+    <style name="ReviewThumbnail">
+        <item name="android:layout_width">86dp</item>
+        <item name="android:layout_height">86dp</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_alignParentRight">true</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:layout_marginRight">28dp</item>
+    </style>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fdb09dd..f1dafcb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -125,4 +125,10 @@
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">@dimen/pano_gray_bar_height</item>
     </style>
+    <style name="ReviewThumbnail">
+        <item name="android:layout_width">52dp</item>
+        <item name="android:layout_height">52dp</item>
+        <item name="android:layout_alignParentTop">true</item>
+        <item name="android:layout_centerHorizontal">true</item>
+    </style>
 </resources>