From f9f24d4c578a01cb09a7e5c4c66b75595d3669ee Mon Sep 17 00:00:00 2001
From: Mark Wagner <mxw@google.com>
Date: Wed, 19 Oct 2011 11:33:15 -0700
Subject: bugfix 5479807 Video preview displaced to right when orientation
 changed

Three changes:

(1) center the play button over the thumbnail
(2) leverage the existing mechanism for scaling the image for video
thumbnails which want to be 4/3
(3) use center_crop for video previews so that they properly align
in the ui.  Not doing so means we were getting black bars at the top
and bottom which was wrong.

Change-Id: Ifc416455d03136a393239487db07493dc27f151e
---
 res/layout/share_popup.xml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'res/layout/share_popup.xml')

diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index c9beb3a..ccc74d9 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -37,14 +37,22 @@
                     android:layout_alignParentTop="true"
                     android:layout_alignParentLeft="true">
                 <!-- The size of the thumbnail is calculated in SharePopup.java -->
-                <ImageView android:id="@+id/thumbnail"
+                <FrameLayout
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:adjustViewBounds="true"
-                        android:scaleType="fitCenter"/>
-            </com.android.camera.ui.RotateLayout>
-            <ImageView android:id="@+id/play"
-                    style="@style/ReviewPlayIcon"/>
+                        android:layout_height="wrap_content" >
+                    <ImageView android:id="@+id/thumbnail"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
+                            android:scaleType="fitCenter"/>
+                    <ImageView android:id="@+id/play"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:scaleType="center"
+                            style="@style/ReviewPlayIcon"/>
+                </FrameLayout>
+            </com.android.camera.ui.RotateLayout> 
         </RelativeLayout>
         <LinearLayout
                 android:layout_width="@dimen/share_item_width"
-- 
cgit v1.1