Add expanded thumbnail in phone UI.

bug:4725968

Change-Id: I2a59a3714b93bc96f2a1689d948c9e4e0edd14cb

6 files changed, 45 insertions, 14 deletions

diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index e211d25..173be1f 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -50,11 +50,6 @@
                 android:visibility="invisible"/>
         <include layout="@layout/review_thumbnail"/>
         <include layout="@layout/review_control"/>
-        <ImageView android:id="@+id/review_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:background="@android:color/black"/>
     </RelativeLayout>
     <!-- This is the border of preview and the corner is round. If it is the background,
          preview will be on top and the inner corner will be square, which looks bad.
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index 6cf4dfe..4e95882 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -49,10 +49,5 @@
                 android:layout_alignParentBottom="true"
                 android:layout_margin="5dp"
                 android:visibility="invisible"/>
-        <ImageView android:id="@+id/review_image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"
-                android:background="@android:color/black"/>
     </RelativeLayout>
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
new file mode 100644
index 0000000..93ffd4b
--- /dev/null
+++ b/res/layout/share_popup.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <com.android.camera.ui.RotateLayout
+            android:id="@+id/rotate_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true">
+        <!-- The size of the thumbnail is calculated in SharePopup.java -->
+        <ImageView
+                android:id="@+id/expanded_thumbnail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitCenter" />
+    </com.android.camera.ui.RotateLayout>
+</RelativeLayout>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index cb34a3c..1f92a5b 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -27,4 +27,8 @@
     <dimen name="mode_switcher_inner_margin">10dp</dimen>
     <dimen name="camera_switcher_margin_right">16dp</dimen>
     <dimen name="camera_switcher_margin_bottom">24dp</dimen>
+    <dimen name="share_image_max_width_landscape">480dp</dimen>
+    <dimen name="share_image_max_height_landscape">360dp</dimen>
+    <dimen name="share_image_max_width_portrait">480dp</dimen>
+    <dimen name="share_image_max_height_portrait">480dp</dimen>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 2ce9d42..567d205 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -34,7 +34,4 @@
         <attr name="largeIcons" format="reference" />
         <attr name="images" format="reference" />
     </declare-styleable>
-    <declare-styleable name="InLineSettingPicker">
-        <attr name="prefKey" format="string" />
-    </declare-styleable>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 5ec105b..cd42854 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -18,5 +18,9 @@
 */
 -->
 <resources>
-    <dimen name="hint_y_offset">64dip</dimen>
+    <dimen name="hint_y_offset">64dp</dimen>
+    <dimen name="share_image_max_width_landscape">320dp</dimen>
+    <dimen name="share_image_max_height_landscape">240dp</dimen>
+    <dimen name="share_image_max_width_portrait">240dp</dimen>
+    <dimen name="share_image_max_height_portrait">240dp</dimen>
 </resources>