Move thumbnail to the top right of the control panel in tablet UI.

bug:5001059
Change-Id: I5a404f31c8fbb80bdb742d4b00354e38a822ac36

6 files changed, 12 insertions, 13 deletions

diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index ed4f31b..f6709e3 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -25,6 +25,8 @@
              this is circular dependency and is not allowed so it's very
              unfortunate that we have to hardcode the width here. -->
 
+        <include layout="@layout/review_thumbnail" />
+
         <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_wheel"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 173be1f..2c7e427 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -48,7 +48,6 @@
                 android:layout_alignParentBottom="true"
                 android:layout_margin="15dp"
                 android:visibility="invisible"/>
-        <include layout="@layout/review_thumbnail"/>
         <include layout="@layout/review_control"/>
     </RelativeLayout>
     <!-- This is the border of preview and the corner is round. If it is the background,
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index f3ef82a..8c47c69 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -25,7 +25,6 @@
         <SurfaceView android:id="@+id/camera_preview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
-        <include layout="@layout/review_thumbnail"/>
         <LinearLayout android:id="@+id/labels"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout-w1024dp/review_thumbnail.xml b/res/layout-w1024dp/review_thumbnail.xml
index 7e7eb62..0290d50 100644
--- a/res/layout-w1024dp/review_thumbnail.xml
+++ b/res/layout-w1024dp/review_thumbnail.xml
@@ -17,11 +17,12 @@
 <com.android.camera.ui.RotateImageView xmlns:android="http://schemas.android.com/apk/res/android"
         android:visibility="invisible"
         android:id="@+id/review_thumbnail"
-        android:layout_width="112dp"
-        android:layout_height="112dp"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="15dp"
+        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: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 1f92a5b..c9f8b1d 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -19,9 +19,8 @@
 -->
 <resources>
     <dimen name="camera_control_width">245dp</dimen>
-    <dimen name="zoom_picker_margin_top">16dp</dimen>
-    <dimen name="zoom_picker_margin_right">36dp</dimen>
-    <dimen name="zoom_picker_distance">44dp</dimen>
+    <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-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml
index d6d7443..2fee255 100644
--- a/res/values-w1280dp/dimens.xml
+++ b/res/values-w1280dp/dimens.xml
@@ -19,9 +19,8 @@
 -->
 <resources>
     <dimen name="camera_control_width">295dp</dimen>
-    <dimen name="zoom_picker_margin_top">48dp</dimen>
-    <dimen name="zoom_picker_margin_right">32dp</dimen>
-    <dimen name="zoom_picker_distance">48dp</dimen>
+    <dimen name="thumbnail_margin_top">32dp</dimen>
+    <dimen name="thumbnail_margin_right">32dp</dimen>
     <dimen name="mode_switcher_margin_right">34dp</dimen>
     <dimen name="mode_switcher_margin_bottom">50dp</dimen>
     <dimen name="mode_switcher_inner_padding">15dp</dimen>