diff options
| author | Angus Kong <shkong@google.com> | 2013-04-09 15:02:59 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-04-11 10:42:33 -0700 |
| commit | 19fb00429458fa3e01d0d5a244f5b31150c76cc5 (patch) | |
| tree | 3ba6c2ef7ac3f4c1321ceb6f96bef912dcb7c885 /res/layout | |
| parent | 6ff650fd8ef417e5bdd181ebad0cbfa15fdb25c6 (diff) | |
| download | android_packages_apps_Snap-19fb00429458fa3e01d0d5a244f5b31150c76cc5.tar.gz android_packages_apps_Snap-19fb00429458fa3e01d0d5a244f5b31150c76cc5.tar.bz2 android_packages_apps_Snap-19fb00429458fa3e01d0d5a244f5b31150c76cc5.zip | |
Integrate FilmStripView.
Change-Id: Ib9f280a4c58a5c120775d5e9340ea04d56c0343d
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 14 | ||||
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 20 |
2 files changed, 30 insertions, 4 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index a84923415..b4ec436c6 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -13,9 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.NewCameraRootView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/camera_app_root" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" > -</com.android.camera.ui.NewCameraRootView>
\ No newline at end of file + <!-- NewCameraRootView needs to be in a FrameLayout to set margins + in the layout parameters. --> + <com.android.camera.ui.NewCameraRootView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_app_root" + android:layout_width="match_parent" + android:layout_height="match_parent" > + </com.android.camera.ui.NewCameraRootView> +</FrameLayout> diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml new file mode 100644 index 000000000..26fc3f030 --- /dev/null +++ b/res/layout/camera_filmstrip.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + 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" + android:layout_width="match_parent" + android:layout_height="match_parent" /> |