diff options
author | Paul Rohde <codelogic@google.com> | 2014-12-05 12:17:15 -0800 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2019-11-09 22:15:24 +0200 |
commit | ae159942ae27f5798051851160b9bae652f5a118 (patch) | |
tree | f2209f9284653a277eaff160c7a60e72c50998a6 /res/layout | |
parent | 70e618bdd825eb8b088d66feeefc0a7f0b06c7ed (diff) | |
download | android_packages_apps_Snap-ae159942ae27f5798051851160b9bae652f5a118.tar.gz android_packages_apps_Snap-ae159942ae27f5798051851160b9bae652f5a118.tar.bz2 android_packages_apps_Snap-ae159942ae27f5798051851160b9bae652f5a118.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/layout')
-rwxr-xr-x | res/layout/capture_module.xml | 4 | ||||
-rwxr-xr-x | res/layout/photo_module.xml | 4 | ||||
-rwxr-xr-x | res/layout/video_module.xml | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index b7be0b330..8600ddd73 100755 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -158,6 +158,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"/> |