SnapdragonCamera: add touch animation for refocus

also added a dialog to explain refocus mode

Change-Id: I8c319c2cb64ca85d320eca453ade9c325fd4ac37

6 files changed, 21 insertions, 2 deletions

diff --git a/res/layout/refocus_editor.xml b/res/layout/refocus_editor.xml
index c4b42bb4c..454d44a46 100644
--- a/res/layout/refocus_editor.xml
+++ b/res/layout/refocus_editor.xml
@@ -65,4 +65,9 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true" />
     </RelativeLayout>
+
+    <view class="com.android.camera.RefocusActivity$Indicator"
+        android:id="@+id/refocus_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 37128e275..13337684b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -541,4 +541,8 @@
     <string name="text_tsmakeup_alert_continue">继续</string>
     <string name="text_tsmakeup_alert_quit">退出</string>
 
+    <string name="all_in_focus">全焦</string>
+    <string name="refocus_toast">点击此处可重新对焦照片</string>
+    <string name="refocus_prompt_title">Macro+</string>
+    <string name="refocus_prompt_message">开启Macro+模式后，相机会连续拍摄5张照片并将其合成一张全焦照片。您还可以事后重新对焦。</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index dba33f40d..3ed0ba889 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -76,4 +76,7 @@
 
     <color name="camera_control_bg_opaque">#ff191919</color>
     <color name="camera_control_bg_transparent">#4d191919</color>
+
+    <color name="refocus_indicator_1">#a0ffffff</color>
+    <color name="refocus_indicator_2">#ff29b6f6</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1ba60c825..564cd099f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -173,4 +173,10 @@
     <!-- Margins for 4:3 preview on 16:9 screen with 640dp height -->
     <dimen name="preview_top_margin">57dp</dimen>
     <dimen name="preview_bottom_margin">103dp</dimen>
+
+    <dimen name="refocus_circle_diameter_1">113dp</dimen>
+    <dimen name="refocus_circle_diameter_2">81dp</dimen>
+    <dimen name="refocus_circle_diameter_3">95dp</dimen>
+    <dimen name="refocus_cross_length">19dp</dimen>
+    <dimen name="refocus_stroke_width">2dp</dimen>
 </resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 157546b43..50179e83b 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -888,6 +888,9 @@
      <string name="text_tsmakeup_alert_quit">Quit</string>
 
     <string name="all_in_focus">All in Focus</string>
+    <string name="refocus_toast">To re-focus last photo, tap here</string>
+    <string name="refocus_prompt_title">Macro+</string>
+    <string name="refocus_prompt_message">With Macro+, your camera will take 5 pictures, each time that you press the shutter button. The 5 pictures will be combined into 1 picture, where everything is in focus. You can choose to re-focus, after you take the picture.</string>
 
     <string name="camera_thermal_shutdown">Phone overheated, closing camera.</string>
     <string name="camera_server_died">Media server died, closing camera.</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2c3a7036..6959a4253 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -725,6 +725,4 @@ CHAR LIMIT = NONE] -->
     <string name="pref_camera_video_rotation_label_270">270</string>
 
     <string name="remaining_photos_format">%d left</string>
-
-    <string name="refocus_toast">To re-focus last photo, tap here</string>
  </resources>