summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
authorErin Dahlgren <edahlgren@google.com>2013-12-17 18:31:35 -0800
committerErin Dahlgren <edahlgren@google.com>2013-12-20 16:01:22 -0800
commit4efa8b54c1df4e06f2d3caed2568015a737f9dda (patch)
tree00dcf7de076a494abfbaf0dd394ee5b62b73e54a /res/layout-land
parent56102c6a83104cea1371114d77a57e1934f2c648 (diff)
downloadandroid_packages_apps_Camera2-4efa8b54c1df4e06f2d3caed2568015a737f9dda.tar.gz
android_packages_apps_Camera2-4efa8b54c1df4e06f2d3caed2568015a737f9dda.tar.bz2
android_packages_apps_Camera2-4efa8b54c1df4e06f2d3caed2568015a737f9dda.zip
New Capture UI.
* depends on ag/400799 Change-Id: Ieb0e27447659bcb04dee57348583f68d680408d2
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/bottom_bar.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout-land/bottom_bar.xml b/res/layout-land/bottom_bar.xml
index e7b44c5ed..c99c1fe22 100644
--- a/res/layout-land/bottom_bar.xml
+++ b/res/layout-land/bottom_bar.xml
@@ -22,9 +22,9 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_gravity="right"
- android:paddingTop="@dimen/camera_controls_padding_start"
- android:paddingBottom="@dimen/camera_controls_padding_end"
android:gravity="center" >
+ <include layout="@layout/bottom_bar_contents" />
+
</com.android.camera.ui.BottomBar>
</merge>