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

1 files changed, 6 insertions, 4 deletions

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9e58a1beb..07523fe78 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -93,6 +93,7 @@
     <string name="preparing_sd" product="default" msgid="7435693655017362767">"正在準備 SD 卡…"</string>
     <string name="access_sd_fail" product="default" msgid="2634861611082499811">"無法存取 SD 卡。"</string>
     <string name="time_lapse_title" msgid="3267978566401228497">"延時攝影錄製"</string>
+    <string name="capturing" msgid="5255164204641920893">"拍攝中"</string>
     <string name="pref_camera_id_title" msgid="4680648115225411185">"選擇相機"</string>
     <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"後置鏡頭"</string>
     <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"前置鏡頭"</string>
@@ -122,6 +123,7 @@
     <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 百萬像素 (16:9)"</string>
+    <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"150 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1_3mp" msgid="3451742533756821502">"130 萬像素"</string>
     <string name="pref_camera_picturesize_entry_1mp" msgid="5043732005295894167">"1 百萬像素"</string>
     <string name="pref_camera_picturesize_entry_vga" msgid="7387786033708903628">"VGA"</string>
@@ -157,10 +159,10 @@
     <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"自動"</string>
     <string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+ (高動態範圍)"</string>
     <string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"高動態範圍"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="4762986338359862238">"開啟 HDR+ (高動態範圍)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="8027383906480914303">"關閉 HDR+ (高動態範圍)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="8567522693524539332">"開啟 HDR (高動態範圍)"</string>
-    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="1121637502250585531">"關閉 HDR (高動態範圍)"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"開啟 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"關閉 HDR+"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"開啟 HDR"</string>
+    <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"關閉 HDR"</string>
     <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"動作"</string>
     <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"夜景"</string>
     <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"日落"</string>