diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-07-31 11:28:21 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-08-01 15:50:13 -0700 |
| commit | 1a7821c03e800cf616f567326b8e2e197f0dcd27 (patch) | |
| tree | 776a84290503c0b01a4f22e352477ddf4ee03faa /res/layout | |
| parent | a0a51343063d9d689771112b9af668f01d8cf87c (diff) | |
| download | android_packages_apps_Snap-1a7821c03e800cf616f567326b8e2e197f0dcd27.tar.gz android_packages_apps_Snap-1a7821c03e800cf616f567326b8e2e197f0dcd27.tar.bz2 android_packages_apps_Snap-1a7821c03e800cf616f567326b8e2e197f0dcd27.zip | |
Adds back the PhotoSphere View icon in filmstrip.
This also exercises the "leave a place cleaner than you found it" rule
by cleaning up stuff:
- Formatting according to the Android format rules
- Removing unused code
- Putting braces where they belong.
Change-Id: Ie1dbfe9195bf3e20d9624d7ae85eeba16df8f931
Diffstat (limited to 'res/layout')
| -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 |