Merge remote-tracking branch into merge_branch

Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
  Import translations. DO NOT MERGE
  gcam: Clean up placeholders, and add deletion robustness.
  Fix issue of focus indicator staying on without being hidden
  Ensure view size gets updated after phone decors change.
  Show the 100% state of the progress at least one frame.
  Add parameters and deduplicate parameter changes
  Revert parallel opening camera in photo mode.
  Differentiate the InProgressData from the normal PhotoData.
  Close mode menus if another control is touched
  Start gcam module directly when handling capture intent.
  Import translations. DO NOT MERGE
  Add a null check to fix NPE
  Add logging to various actions
  Ensure mOpenCameraThread has been setup before dereferencing.
  Add logging to various actions
  Ensure mOpenCameraThread has been setup before dereferencing.
  Add GCam progress indicator.
  hide preview cover on arrival of new preview data if hidden
  Fix photo mode is getting stuck in a single CameraState.
  ...

Conflicts:
	res/layout/photo_module.xml
	res/values/arrays.xml
	src/com/android/camera/CameraActivity.java
	src/com/android/camera/PhotoUI.java
	src/com/android/camera/Storage.java
	src/com/android/camera/WideAnglePanoramaModule.java
	src/com/android/camera/ui/FilmStripView.java

Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f

5 files changed, 49 insertions, 0 deletions

diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml
index 5b049fe5e..1ad07aee9 100644
--- a/res/layout/filmstrip_bottom_controls.xml
+++ b/res/layout/filmstrip_bottom_controls.xml
@@ -30,6 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:background="@drawable/photopage_bottom_button_background"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
@@ -55,6 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:background="@drawable/photopage_bottom_button_background"
         android:paddingBottom="5dp"
         android:paddingLeft="15dp"
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml
index 0b2785a3e..581170f07 100644
--- a/res/layout/panorama_module.xml
+++ b/res/layout/panorama_module.xml
@@ -19,6 +19,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <include layout="@layout/pano_module_capture" />
+    <View
+        android:id="@+id/preview_cover"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/black"
+        android:visibility="gone" />
     <include layout="@layout/pano_module_review" />
     <include layout="@layout/camera_controls"
              android:layout_gravity="center"
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index b1c5cdfd8..5d00da102 100644
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -96,6 +96,12 @@
                 </TableRow>
             </TableLayout>
         </RelativeLayout>
+        <View
+            android:id="@+id/preview_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            android:visibility="gone" />
     <ImageView
         android:id="@+id/review_image"
         android:layout_width="match_parent"
diff --git a/res/layout/placeholder_progressbar.xml b/res/layout/placeholder_progressbar.xml
new file mode 100644
index 000000000..45eadfbe0
--- /dev/null
+++ b/res/layout/placeholder_progressbar.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/placeholder_progress"
+        style="@android:style/Widget.Holo.ProgressBar.Large"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:paddingBottom="58dp"
+        android:visibility="visible"
+        android:indeterminate="true"
+        android:indeterminateOnly="true"
+        android:background="@null"/>
+
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index b4444e7f0..198be8913 100644
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -26,6 +26,12 @@
             android:id="@+id/preview_content"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
+        <View
+            android:id="@+id/preview_cover"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/black"
+            android:visibility="gone" />
     </FrameLayout>
     <View
         android:id="@+id/flash_overlay"