diff options
| author | Paul Rohde <codelogic@google.com> | 2014-12-05 12:17:15 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-15 10:01:23 -0800 |
| commit | d8420e3702c5504e45a51fd29642167b4ab66312 (patch) | |
| tree | 6aaebf6a1982a8897966821edc86efb004b079ae /res/layout | |
| parent | db2718622223b230618e9dae5b0c5d2eb4e68741 (diff) | |
| download | android_packages_apps_Snap-d8420e3702c5504e45a51fd29642167b4ab66312.tar.gz android_packages_apps_Snap-d8420e3702c5504e45a51fd29642167b4ab66312.tar.bz2 android_packages_apps_Snap-d8420e3702c5504e45a51fd29642167b4ab66312.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')
| -rw-r--r-- | res/layout/photo_module.xml | 4 | ||||
| -rw-r--r-- | res/layout/video_module.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 178359296..a516f0034 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -57,6 +57,10 @@ android:layout_marginTop="15dip" 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" /> <ImageView 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 8fe42e178..520caaecd 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -70,6 +70,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" |