From 987ee64612e2510004fdf08536746c87234d01c1 Mon Sep 17 00:00:00 2001
From: Paul Rohde <codelogic@google.com>
Date: Fri, 5 Dec 2014 12:17:15 -0800
Subject: 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
---
 res/layout/camera.xml             |   4 ++--
 res/raw/material_camera_focus.ogg | Bin 0 -> 19122 bytes
 res/values/colors.xml             |   1 +
 res/values/dimens.xml             |   3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 res/raw/material_camera_focus.ogg

(limited to 'res')

diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 121dc0fbc..860376ea0 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -26,8 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <com.android.camera.ui.FocusOverlay
-        android:id="@+id/focus_overlay"
+    <com.android.camera.ui.focus.FocusRingView
+        android:id="@+id/focus_ring"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
diff --git a/res/raw/material_camera_focus.ogg b/res/raw/material_camera_focus.ogg
new file mode 100644
index 000000000..555d7f444
Binary files /dev/null and b/res/raw/material_camera_focus.ogg differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2eee2ac82..3fc3131c9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -66,6 +66,7 @@
     <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
     <color name="bright_foreground_holo_dark">#fff3f3f3</color>
     <color name="face_detect_start">#ffffff00</color>
+    <color name="focus_color">#ffffffff</color>
     <color name="focus_debug">#90ffffff</color>
     <color name="focus_debug_text">#b0ffffff</color>
     <color name="focus_debug_success">#9000ff00</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c09463390..18257a24c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -93,6 +93,9 @@
     <dimen name="switcher_size">72dp</dimen>
     <dimen name="face_circle_stroke">1dip</dimen>
     <dimen name="focus_debug_stroke">1dip</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="shutter_offset">-22dp</dimen>
     <dimen name="size_thumbnail">200dip</dimen>
     <dimen name="size_preview">400dip</dimen>
-- 
cgit v1.2.3