Change the default orientation to portrait.

bug:5446617

Since the orientation is mainly portrait on phones, the default
orientation of an application will decide if the window animation will
be played before it starts. In order to reduce the launch time of Camera
apps, this change is to skip the window animations by changing the default
orientation to portrait.

Change-Id: I6682ab408d7e8d1f0580f3c1600b6c9c3d6a7f6e

1 files changed, 32 insertions, 28 deletions

diff --git a/res/layout/share_popup.xml b/res/layout/share_popup.xml
index ccc74d97..d8035a0f 100644
--- a/res/layout/share_popup.xml
+++ b/res/layout/share_popup.xml
@@ -19,30 +19,31 @@
 <FrameLayout
         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"
+        android:layout_width="match_parent"
         android:background="@color/share_popup_background">
     <FrameLayout android:id="@+id/root"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
             android:layout_gravity="left|center">
         <RelativeLayout android:id="@+id/share_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center"
                 android:background="@drawable/border_last_picture">
             <com.android.camera.ui.RotateLayout
                     android:id="@+id/thumbnail_rotate_layout"
-                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentLeft="true">
+                    android:layout_width="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentRight="true">
                 <!-- The size of the thumbnail is calculated in SharePopup.java -->
                 <FrameLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" >
                     <ImageView android:id="@+id/thumbnail"
-                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_width="wrap_content"
                             android:adjustViewBounds="true"
                             android:scaleType="fitCenter"/>
                     <ImageView android:id="@+id/play"
@@ -52,40 +53,43 @@
                             android:scaleType="center"
                             style="@style/ReviewPlayIcon"/>
                 </FrameLayout>
-            </com.android.camera.ui.RotateLayout> 
+            </com.android.camera.ui.RotateLayout>
         </RelativeLayout>
-        <LinearLayout
-                android:layout_width="@dimen/share_item_width"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:layout_gravity="right"
+        <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/share_item_height"
+                android:layout_gravity="bottom"
                 android:background="@color/share_icon_background">
             <com.android.camera.ui.RotateLayout
-                    android:layout_marginTop="8dip"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="8dip"
                     android:id="@+id/goto_gallery_button_rotate"
-                    android:layout_gravity="center"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
+                    android:layout_centerVertical="true"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content">
                 <ImageButton
                         android:id="@+id/goto_gallery_button"
                         android:background="?android:attr/selectableItemBackground"
                         android:layout_gravity="center"
-                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_width="wrap_content"
                         android:src="@drawable/ic_gallery" />
             </com.android.camera.ui.RotateLayout>
             <View
-                    android:layout_width="match_parent"
+                    android:id="@+id/gallery_button_divider"
+                    android:layout_toLeftOf="@+id/goto_gallery_button_rotate"
+                    android:layout_height="match_parent"
                     android:layout_margin="8dip"
-                    android:layout_height="1dp"
+                    android:layout_width="1dp"
                     android:background="#5affffff" />
 
-            <ListView android:id="@+id/share_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:choiceMode="singleChoice"
-                    style="@android:style/Widget.Holo.ListView" />
-        </LinearLayout>
+            <com.android.camera.ui.RightAlignedHorizontalScrollView android:id="@+id/share_list_container"
+                    android:layout_toLeftOf="@+id/gallery_button_divider"
+                    android:layout_height="match_parent"
+                    android:layout_width="wrap_content">
+                <com.android.camera.ui.OneRowGridView android:id="@+id/share_list"
+                        style="@style/OneRowGrid"/>
+            </com.android.camera.ui.RightAlignedHorizontalScrollView>
+        </RelativeLayout>
     </FrameLayout>
 </FrameLayout>