diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-08-15 17:19:22 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-08-19 11:39:16 -0700 |
| commit | 88ef7664ba6a888fa5da8693091674e152b56192 (patch) | |
| tree | 52c8293d42b394cf09b7d01551df1f2e4787e96a /res/layout/camera_filmstrip.xml | |
| parent | 1571239c21fc4be7fd3c8db6ff1b8dc22f4d7e6f (diff) | |
| download | android_packages_apps_Camera2-88ef7664ba6a888fa5da8693091674e152b56192.tar.gz android_packages_apps_Camera2-88ef7664ba6a888fa5da8693091674e152b56192.tar.bz2 android_packages_apps_Camera2-88ef7664ba6a888fa5da8693091674e152b56192.zip | |
Bring back the bottom controls in Filmstrip.
Bug: 10367172
Bug: 10074320
Also hooks up the Edit button and the edit menu item.
Change-Id: I0ce3344e09fdfd7794c417ddbe44b3d247a7ed7c
Diffstat (limited to 'res/layout/camera_filmstrip.xml')
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index d94a9d2a8..4281aac3d 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -24,19 +24,7 @@ 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:visibility="gone" - android:src="@drawable/ic_view_photosphere" /> + <include layout="@layout/filmstrip_bottom_controls" /> <LinearLayout android:id="@+id/pano_stitching_progress_panel" |