diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-01 22:50:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-01 22:50:53 +0000 |
| commit | 7c547a764b0243f3804c77748ac28b1a56d85173 (patch) | |
| tree | 35ed351eddecbdc4f0e93838bae600948c0fb3bf /res | |
| parent | b0f7a8f7f7d95ae12e92f529fd9a8a37f75b105c (diff) | |
| parent | 0a4cfdc5ee74759893142754faea77d0d0aba48c (diff) | |
| download | android_packages_apps_Gallery2-7c547a764b0243f3804c77748ac28b1a56d85173.tar.gz android_packages_apps_Gallery2-7c547a764b0243f3804c77748ac28b1a56d85173.tar.bz2 android_packages_apps_Gallery2-7c547a764b0243f3804c77748ac28b1a56d85173.zip | |
Merge "Adds back the PhotoSphere View icon in filmstrip." into gb-ub-photos-carlsbad
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 26fc3f030..85f04125d 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- + Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -13,8 +14,27 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.FilmStripView -xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/filmstrip_view" + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" > + + <com.android.camera.ui.FilmStripView + android:id="@+id/filmstrip_view" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <ImageButton + android:id="@+id/filmstrip_bottom_control_panorama" + android:layout_width="70dp" + android:layout_height="70dp" + android:layout_gravity="bottom|center_horizontal" + android:background="@drawable/transparent_button_background" + android:clickable="true" + android:paddingBottom="5dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_view_photosphere" /> + +</FrameLayout>
\ No newline at end of file |