diff options
| author | Angus Kong <shkong@google.com> | 2013-12-03 08:54:42 -0800 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-12-04 17:10:37 -0800 |
| commit | 166e36fb6e04d40a1bef0459ee6b96c9c736039b (patch) | |
| tree | 5398557e6c5e5db7e51e2fc2e71d73eca32dc254 /res/layout/camera_filmstrip.xml | |
| parent | c17636cbf6169db28109d5ee2cf0081956f02077 (diff) | |
| download | android_packages_apps_Camera2-166e36fb6e04d40a1bef0459ee6b96c9c736039b.tar.gz android_packages_apps_Camera2-166e36fb6e04d40a1bef0459ee6b96c9c736039b.tar.bz2 android_packages_apps_Camera2-166e36fb6e04d40a1bef0459ee6b96c9c736039b.zip | |
Implement the new filmstrip UI - first step.
More fancy stuffs will be added in the following CLs.
Change-Id: I065c7baf1ff9695121db4917158ffecd0bfc0d01
Diffstat (limited to 'res/layout/camera_filmstrip.xml')
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index c25ef4f97..ce5d400a6 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -15,23 +15,25 @@ limitations under the License. --> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_layout_root" +<com.android.camera.ui.FilmstripLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/filmstrip_layout" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent" + android:visibility="invisible"> <com.android.camera.ui.FilmstripView android:id="@+id/filmstrip_view" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:background="@color/filmstrip_background"/> + + <include layout="@layout/filmstrip_bottom_controls" /> <FrameLayout android:id="@+id/camera_above_filmstrip_layout" android:layout_width="match_parent" android:layout_height="match_parent" > - <include layout="@layout/filmstrip_bottom_controls" /> - <LinearLayout android:id="@+id/pano_stitching_progress_panel" android:layout_width="match_parent" @@ -67,5 +69,4 @@ android:layout_gravity="bottom|center_horizontal" /> </LinearLayout> </FrameLayout> - -</merge> +</com.android.camera.ui.FilmstripLayout> |