diff options
| author | Andy Huibers <andyhuibers@google.com> | 2014-08-26 22:57:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-26 22:57:11 +0000 |
| commit | 462d9c510bbd072c63fb5be1ec12df15b4775f5f (patch) | |
| tree | d58c81750a669afd65424c81e6f442c47420518b /res | |
| parent | 9109871358e32726f23d9b4db9d6fbf55a03cddc (diff) | |
| parent | e2f5fdda4b19da650a7616853990624969d0f384 (diff) | |
| download | android_packages_apps_Camera2-462d9c510bbd072c63fb5be1ec12df15b4775f5f.tar.gz android_packages_apps_Camera2-462d9c510bbd072c63fb5be1ec12df15b4775f5f.tar.bz2 android_packages_apps_Camera2-462d9c510bbd072c63fb5be1ec12df15b4775f5f.zip | |
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/colors.xml | 6 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 8b6ee22b5..a70d44357 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -66,8 +66,10 @@ <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="face_detect_success">#8050d060</color> - <color name="face_detect_fail">#80d05060</color> + <color name="focus_debug">#90ffffff</color> + <color name="focus_debug_light">#50ffffff</color> + <color name="focus_debug_success">#9000ff00</color> + <color name="focus_debug_fail">#90ff0000</color> <color name="gray">#FFAAAAAA</color> <!-- Camera mode switcher --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 19c0e8ac6..c1aa9891c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -93,6 +93,7 @@ <dimen name="focus_inner_stroke">2dp</dimen> <dimen name="switcher_size">72dp</dimen> <dimen name="face_circle_stroke">1dip</dimen> + <dimen name="focus_debug_stroke">1dip</dimen> <dimen name="shutter_offset">-22dp</dimen> <dimen name="size_thumbnail">200dip</dimen> <dimen name="size_preview">400dip</dimen> |