diff options
author | Wei-Ta Chen <weita@google.com> | 2011-06-14 16:53:04 -0700 |
---|---|---|
committer | Angus Kong <shkong@google.com> | 2011-07-27 07:37:20 +0800 |
commit | bdc7e2b461064b25b7f17b0941077fc97653093d (patch) | |
tree | 98bca1531a7e5eec6f7a531cd2a89901bb419e21 /res/layout/panorama.xml | |
parent | f8e7cdfca602c5f9699b54f25e1552fc20fadd15 (diff) | |
download | LegacyCamera-bdc7e2b461064b25b7f17b0941077fc97653093d.zip LegacyCamera-bdc7e2b461064b25b7f17b0941077fc97653093d.tar.gz LegacyCamera-bdc7e2b461064b25b7f17b0941077fc97653093d.tar.bz2 |
Check in the Mosaic Stitching codes.
1. Camera setup moved to activity level.
2. Fixed releasing and acquiring camera process.
3. Unused .xml files removed.
4. Style issues fixed.
Bug: 5031489
Change-Id: Ifd271588ca2168398e17f204f065681ead2d8f2f
Diffstat (limited to 'res/layout/panorama.xml')
-rw-r--r-- | res/layout/panorama.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/res/layout/panorama.xml b/res/layout/panorama.xml new file mode 100644 index 0000000..b92d81d --- /dev/null +++ b/res/layout/panorama.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" + android:id="@+id/panorama_root" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <include layout="@layout/pano_views"/> + <include layout="@layout/pano_control"/> +</LinearLayout> |