summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-11-09 17:23:29 +0800
committerHung-ying Tyan <tyanh@google.com>2010-11-09 17:28:40 +0800
commitec689e833e5730517d190a136710186a8f0c1445 (patch)
tree9fb3d45ce21572452a7ab5d05538554cd2c4d682 /res
parent6897561d02003e59c038f1dc4d4669e3723e9cad (diff)
downloadLegacyCamera-ec689e833e5730517d190a136710186a8f0c1445.zip
LegacyCamera-ec689e833e5730517d190a136710186a8f0c1445.tar.gz
LegacyCamera-ec689e833e5730517d190a136710186a8f0c1445.tar.bz2
Add new layout file for camera.
+ Copied the layout file from res/layout and put it in res/layout-xlarge. + Changed FrameLayout to RelativeLayout in the new layout file. + Replace FrameLayout with View/ViewGroup in the code as it's not layout specific. Bug: 3156684 (in progress) Change-Id: Ife35528c08bc0e35793a0ff645ec9a7260c842c1
Diffstat (limited to 'res')
-rw-r--r--res/layout-xlarge/camera.xml41
1 files changed, 41 insertions, 0 deletions
diff --git a/res/layout-xlarge/camera.xml b/res/layout-xlarge/camera.xml
new file mode 100644
index 0000000..639e3ab
--- /dev/null
+++ b/res/layout-xlarge/camera.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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/camera"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <com.android.camera.PreviewFrameLayout android:id="@+id/frame_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="2dp"
+ android:layout_weight="1">
+ <RelativeLayout android:id="@+id/frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@drawable/border_view_finder">
+ <SurfaceView android:id="@+id/camera_preview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+ <com.android.camera.FocusRectangle
+ android:id="@+id/focus_rectangle"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+ </RelativeLayout>
+ </com.android.camera.PreviewFrameLayout>
+</LinearLayout>