From 37f3611bbdc787c996a99894dcef7d8fb77e3f7c Mon Sep 17 00:00:00 2001
From: Sascha Haeberling <haeberling@google.com>
Date: Tue, 6 Aug 2013 14:31:52 -0700
Subject: This adds the following four CLs to Camera2:

  http://ag/339319
  http://ag/338974
  http://ag/338401
  http://ag/324149

Adapted to work in Camera2 and adding a .gitignore so that temporary
Eclipse files and folders are not submitted.

Change-Id: I40295c7f0139f76270c44f0ca395c0574a288569
---
 res/layout-land/camera_controls.xml |  3 ++-
 res/layout-port/camera_controls.xml |  3 ++-
 res/layout/camera_filmstrip.xml     | 39 ++++++++++++++++++++++++++++++++++++-
 res/layout/video_module.xml         |  7 +++++++
 4 files changed, 49 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index 432ae9ebd..d1772401e 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -59,11 +59,12 @@
             android:scaleType="center"
             android:src="@drawable/btn_new_shutter" />
 
-        <View
+        <ImageView
             android:id="@+id/preview_thumb"
             android:visibility="invisible"
             android:layout_width="@dimen/capture_size"
             android:layout_height="@dimen/capture_size"
+            android:scaleType="centerInside"
             android:layout_gravity="top|right" />
 
 </com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 7dd66e44f..5f89830c5 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -59,11 +59,12 @@
             android:scaleType="center"
             android:src="@drawable/btn_new_shutter" />
 
-        <View
+        <ImageView
             android:id="@+id/preview_thumb"
             android:visibility="invisible"
             android:layout_width="@dimen/capture_size"
             android:layout_height="@dimen/capture_size"
+            android:scaleType="centerInside"
             android:layout_gravity="top|right" />
 
 </com.android.camera.ui.CameraControls>
\ No newline at end of file
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 935f38ae8..d94a9d2a8 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -38,4 +38,41 @@
         android:visibility="gone"
         android:src="@drawable/ic_view_photosphere" />
 
-</FrameLayout>
\ No newline at end of file
+    <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>
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 9eb3e84e2..2df1adc9b 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -21,6 +21,13 @@
         android:id="@+id/preview_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+    <View
+        android:id="@+id/flash_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/white"
+        android:visibility="gone"
+        android:alpha="0" />
     <FrameLayout android:id="@+id/preview_border"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-- 
cgit v1.2.3