diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-13 23:27:35 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-13 23:33:37 -0800 |
| commit | 302dfef488297152978788c2341cd3460727b251 (patch) | |
| tree | e505947a46b291f22f1ee625ff82ebbec528353b /res/layout/capture_module.xml | |
| parent | 7f040079cb93d6b5180147cd369e73d43078c91a (diff) | |
| download | android_packages_apps_Snap-302dfef488297152978788c2341cd3460727b251.tar.gz android_packages_apps_Snap-302dfef488297152978788c2341cd3460727b251.tar.bz2 android_packages_apps_Snap-302dfef488297152978788c2341cd3460727b251.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> |