diff options
| author | Paul Rohde <codelogic@google.com> | 2014-12-05 12:17:15 -0800 |
|---|---|---|
| committer | Paul Rohde <codelogic@google.com> | 2014-12-17 10:46:54 -0800 |
| commit | 987ee64612e2510004fdf08536746c87234d01c1 (patch) | |
| tree | 453d22c3c2548eecaa9e23c2a6e0bcbe1482b949 /res | |
| parent | b79279f49e365cc6da75c1bc44b4c786036d0aa7 (diff) | |
| download | android_packages_apps_Camera2-987ee64612e2510004fdf08536746c87234d01c1.tar.gz android_packages_apps_Camera2-987ee64612e2510004fdf08536746c87234d01c1.tar.bz2 android_packages_apps_Camera2-987ee64612e2510004fdf08536746c87234d01c1.zip | |
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
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/camera.xml | 4 | ||||
| -rw-r--r-- | res/raw/material_camera_focus.ogg | bin | 0 -> 19122 bytes | |||
| -rw-r--r-- | res/values/colors.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 3 |
4 files changed, 6 insertions, 2 deletions
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 Binary files differnew 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 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> |