summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-26 06:45:02 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-26 06:45:02 -0800
commitca6f7e139f4db45edc5e2d9b5ef7f827e1e94344 (patch)
tree9a80e70876073cf77b85eeebf861308c9e42b4ac /res
parent277c60e164e3b5a307543a5b5da8558191731cde (diff)
parent1de5c96a551b30990c776c7d70c2c091271fdf26 (diff)
downloadandroid_packages_apps_Snap-ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344.tar.gz
android_packages_apps_Snap-ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344.tar.bz2
android_packages_apps_Snap-ca6f7e139f4db45edc5e2d9b5ef7f827e1e94344.zip
Merge "Snapdragon: Fix orientation of Prepare panorama dialog"
Diffstat (limited to 'res')
-rw-r--r--res/layout/panorama_module.xml29
1 files changed, 29 insertions, 0 deletions
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml
index 581170f07..db05b806c 100644
--- a/res/layout/panorama_module.xml
+++ b/res/layout/panorama_module.xml
@@ -25,6 +25,35 @@
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone" />
+
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/waitingDialog"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center" >
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/pano_progress_empty"
+ android:orientation="horizontal"
+ android:padding="10dp" >
+
+ <ProgressBar
+ style="@android:attr/progressBarStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:text="@string/pano_dialog_prepare_preview" />
+ </LinearLayout>
+ </com.android.camera.ui.RotateLayout>
+
<include layout="@layout/pano_module_review" />
<include layout="@layout/camera_controls"
android:layout_gravity="center"