Drop new focus indicator into Camera2.

* Create a new custom focus view that interacts with physical lens diopter changes.
* Replace all occurances of the old focus indicator with the new one.

Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b

6 files changed, 18 insertions, 0 deletions

diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 46acf2886..a1257a1be 100755
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -107,6 +107,10 @@
             android:layout_height="200dip"
             android:layout_marginTop="50dip"
             android:layout_marginLeft="15dip" />
+        <com.android.camera.ui.focus.FocusRingView
+            android:id="@+id/focus_ring"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
     </FrameLayout>
 
     <com.android.camera.ui.RenderOverlay
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
index 904b15461..ba5758747 100755
--- a/res/layout/photo_module.xml
+++ b/res/layout/photo_module.xml
@@ -58,6 +58,10 @@
             android:layout_marginTop="50dip"
             android:layout_marginLeft="15dip" />
     </RelativeLayout>
+    <com.android.camera.ui.focus.FocusRingView
+        android:id="@+id/focus_ring"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
     <com.android.camera.ui.RotateImageView
         android:id="@+id/review_image"
         android:layout_width="match_parent"
diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml
index 56f585787..0d8c4cb30 100755
--- a/res/layout/video_module.xml
+++ b/res/layout/video_module.xml
@@ -97,6 +97,11 @@
             android:onClick="onReviewPlayClicked"/>
     </FrameLayout>
 
+    <com.android.camera.ui.focus.FocusRingView
+        android:id="@+id/focus_ring"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <include layout="@layout/camera_controls"
         android:layout_gravity="center"
         style="@style/CameraControls"/>
diff --git a/res/raw/material_camera_focus.ogg b/res/raw/material_camera_focus.ogg
new file mode 100644
index 000000000..555d7f444
--- /dev/null
+++ b/res/raw/material_camera_focus.ogg
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ee79867cb..719ef7723 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -68,6 +68,7 @@
     <color name="face_detect_start">@color/white</color>
     <color name="face_detect_success">@color/green</color>
     <color name="face_detect_fail">@color/red</color>
+    <color name="focus_color">#ffffffff</color>
     <color name="gray">@color/grey</color>
 
     <color name="setting_list_selected">#40fafafa</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 210b4739c..29fbbe561 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -93,6 +93,10 @@
     <dimen name="toggle_size">30dp</dimen>
     <dimen name="toggle_outer_size">60dp</dimen>
     <dimen name="face_circle_stroke">2dip</dimen>
+    <dimen name="focus_circle_stroke">1.25dp</dimen>
+    <dimen name="focus_circle_min_size">24dp</dimen>
+    <dimen name="focus_circle_max_size">96dp</dimen>
+    <dimen name="focus_circle_initial_size">48dp</dimen>
     <dimen name="zoom_font_size">14pt</dimen>
     <dimen name="shutter_offset">11dp</dimen>
     <dimen name="shutter_offset_top">2dp</dimen>