Fix bugs about review control in video intent mode.

- Switch position of checkmark and X.
- Let review play icon visible in intent mode.
- Let review control visible after reviewing video.

bug:5244256
Change-Id: I20d51faf9fb5658ee009dd45ff112947cf4ebf02

2 files changed, 16 insertions, 16 deletions

diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index 7cbc0a8..555f55d 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -43,6 +43,14 @@
                     android:drawablePadding="5dp"
                     android:visibility="gone" />
         </LinearLayout>
+        <ImageView android:id="@+id/review_image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"
+                android:background="@android:color/black"/>
+        <ImageButton android:id="@+id/btn_play"
+                style="@style/ReviewPlayIcon"
+                android:onClick="onPlayButtonClicked" />
         <TextView android:id="@+id/bg_replace_message"
                 android:layout_width="300dp"
                 android:layout_height="wrap_content"
@@ -53,13 +61,5 @@
                 android:visibility="gone"
                 android:background="@drawable/bg_text_on_preview"
                 android:text="@string/bg_replacement_message" />
-        <ImageButton android:id="@+id/btn_play"
-                style="@style/ReviewPlayIcon"
-                android:onClick="onPlayButtonClicked" />
-        <ImageView android:id="@+id/review_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:background="@android:color/black"/>
     </com.android.camera.PreviewFrameLayout>
 </RelativeLayout>
diff --git a/res/layout-w1024dp/review_control.xml b/res/layout-w1024dp/review_control.xml
index 7fdbafb..ba16b7b 100644
--- a/res/layout-w1024dp/review_control.xml
+++ b/res/layout-w1024dp/review_control.xml
@@ -19,14 +19,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     <LinearLayout style="@style/ReviewControlGroup"
-            android:id="@+id/btn_cancel"
-            android:onClick="onCancelButtonClicked"
+            android:id="@+id/btn_done"
+            android:onClick="onDoneButtonClicked"
             android:layout_alignParentTop="true"
             android:layout_marginTop="36dp">
         <ImageView style="@style/ReviewControlIcon"
-                android:src="@drawable/ic_menu_cancel_holo_light" />
+                android:src="@drawable/ic_menu_done_holo_light" />
         <TextView style="@style/ReviewControlText"
-                android:text="@string/review_cancel" />
+                android:text="@string/review_ok" />
     </LinearLayout>
     <ImageView android:id="@+id/btn_retake"
             android:layout_width="wrap_content"
@@ -39,13 +39,13 @@
             android:onClick="onRetakeButtonClicked"
             android:background="@drawable/btn_shutter_retake" />
     <LinearLayout style="@style/ReviewControlGroup"
-            android:id="@+id/btn_done"
-            android:onClick="onDoneButtonClicked"
+            android:id="@+id/btn_cancel"
+            android:onClick="onCancelButtonClicked"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="36dp">
         <ImageView style="@style/ReviewControlIcon"
-                android:src="@drawable/ic_menu_done_holo_light" />
+                android:src="@drawable/ic_menu_cancel_holo_light" />
         <TextView style="@style/ReviewControlText"
-                android:text="@string/review_ok" />
+                android:text="@string/review_cancel" />
     </LinearLayout>
 </RelativeLayout>