diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-13 23:27:35 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:40 +0200 |
| commit | 393a2d292a0b746c37ae9f131ffc9994affdaf74 (patch) | |
| tree | f718e5145806b7b6d2488b9bf489d0853ebb8a8d /res/layout/capture_module.xml | |
| parent | 586c4093fdcdb5459938e45b72becd242504c75b (diff) | |
| download | android_packages_apps_Snap-393a2d292a0b746c37ae9f131ffc9994affdaf74.tar.gz android_packages_apps_Snap-393a2d292a0b746c37ae9f131ffc9994affdaf74.tar.bz2 android_packages_apps_Snap-393a2d292a0b746c37ae9f131ffc9994affdaf74.zip | |
snap: UI checkpoint #2
* Fix bugs from previous commit
* Factor out recording controls
* Clean up layouts
* Asynchronous control for video module
* Performance improvements
Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625
Diffstat (limited to 'res/layout/capture_module.xml')
| -rw-r--r-- | res/layout/capture_module.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml index dba8de9a8..eee33f50a 100644 --- a/res/layout/capture_module.xml +++ b/res/layout/capture_module.xml @@ -103,8 +103,8 @@ </LinearLayout> </com.android.camera.ui.RotateLayout> - <include - style="@style/CameraControls" - layout="@layout/camera_controls" - android:layout_gravity="center" /> + <include layout="@layout/camera_controls" + android:layout_gravity="center" + style="@style/CameraControls"/> + </merge> |