summaryrefslogtreecommitdiffstats
path: root/res/layout/camera_filmstrip.xml
diff options
context:
space:
mode:
authorSpike Sprague <spikuru@google.com>2014-08-19 15:33:45 -0700
committerSpike Sprague <spikuru@google.com>2014-08-21 11:23:05 -0700
commitba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2 (patch)
tree7d170976a123d161e637f555c6979c128cd484fc /res/layout/camera_filmstrip.xml
parent0382139c99988f0002afeafb4c35f3599b1fc02f (diff)
downloadandroid_packages_apps_Camera2-ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2.tar.gz
android_packages_apps_Camera2-ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2.tar.bz2
android_packages_apps_Camera2-ba97d192b63ea81edf2dd6ca5cfbf6646a1f25a2.zip
animate filmstrip bottom button bar in and out
from the bottom of the screen bug: 17114515 Change-Id: If3024f149fc0be0e48a430468c53774893946938
Diffstat (limited to 'res/layout/camera_filmstrip.xml')
-rw-r--r--res/layout/camera_filmstrip.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 63af3e593..023c7dd57 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -31,6 +31,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
- <include layout="@layout/filmstrip_bottom_controls" />
</FrameLayout>
+
+ <include layout="@layout/filmstrip_bottom_controls" />
</com.android.camera.widget.FilmstripLayout>