diff options
| author | Paul Rohde <codelogic@google.com> | 2014-12-05 12:17:15 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 21:57:44 +0200 |
| commit | a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092 (patch) | |
| tree | d807835b35152ff8116abf6bfbb0e1c34ad3074e /res | |
| parent | e29d34af65c92b85f43ec114fa8d13391bffabab (diff) | |
| download | android_packages_apps_Snap-a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092.tar.gz android_packages_apps_Snap-a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092.tar.bz2 android_packages_apps_Snap-a83d9afd1b0eab6f5ad5aaf300ae7e5e6eb2c092.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/capture_module.xml | 5 | ||||
| -rw-r--r-- | res/layout/photo_module.xml | 4 | ||||
| -rw-r--r-- | res/layout/video_module.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 | 4 |
6 files changed, 18 insertions, 0 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index 41757c535..b03c43317 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -59,6 +59,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone"/> + + <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 8195b3aee..63a8f28e5 100644 --- 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 2456caf82..c6a9d7e80 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -77,6 +77,10 @@ android:id="@+id/labels" /> </LinearLayout> </com.android.camera.ui.RotateLayout> + <com.android.camera.ui.focus.FocusRingView + android:id="@+id/focus_ring" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <ImageView android:id="@+id/review_image" android:layout_height="match_parent" android:layout_width="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 82e061168..3779e0f97 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_color">@color/black</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 88379e8da..96f156017 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -98,6 +98,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> |