X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=res%2Flayout%2Fcamera_filmstrip.xml;h=d94a9d2a8833d6c149e46d9ba2dad542b4e6bdd0;hb=62c70f5f3d172dfdd518160ed3db1655760074df;hp=26fc3f0302009a630a48da13690ff2a5d4077c3e;hpb=b76b40ec0d7061d721bf45282b88ff4a868f2990;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 26fc3f030..d94a9d2a8 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<!--
+     Copyright (C) 2013 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.
@@ -13,8 +14,65 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.android.camera.ui.FilmStripView
-xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/filmstrip_view"
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent" >
+
+    <com.android.camera.ui.FilmStripView
+        android:id="@+id/filmstrip_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <ImageButton
+        android:id="@+id/filmstrip_bottom_control_panorama"
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_gravity="bottom|center_horizontal"
+        android:background="@drawable/transparent_button_background"
+        android:clickable="true"
+        android:paddingBottom="5dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingTop="5dp"
+        android:visibility="gone"
+        android:src="@drawable/ic_view_photosphere" />
+
+    <LinearLayout
+        android:id="@+id/pano_stitching_progress_panel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:paddingBottom="52dp"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:paddingTop="5dp"
+        android:visibility="gone"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/pano_stitching_progress_text"
+            android:text="@string/pano_progress_text"
+            android:textColor="#ffffffff"
+            android:textSize="14dp"
+            android:shadowColor="#ff000000"
+            android:shadowDx="0"
+            android:shadowDy="0"
+            android:shadowRadius="2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:paddingBottom="8dp"
+            android:visibility="visible"
+            android:layout_gravity="right"/>
+
+        <ProgressBar
+            android:id="@+id/pano_stitching_progress_bar"
+            style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            android:layout_gravity="bottom|center_horizontal" />
+    </LinearLayout>
+
+</FrameLayout>