summaryrefslogtreecommitdiffstats
path: root/res/layout-w1024dp
diff options
context:
space:
mode:
authorrepo sync <cywang@google.com>2011-07-27 19:29:41 +0800
committerrepo sync <cywang@google.com>2011-07-29 06:32:37 +0800
commita72d73cbac59db43d413291e4db66763be08143a (patch)
tree23bc183be660a45815b8378cccbe2f3f2b3a42cd /res/layout-w1024dp
parent07c328d3f67ecfb2b01f9b9765e1d2426c0959fd (diff)
downloadLegacyCamera-a72d73cbac59db43d413291e4db66763be08143a.zip
LegacyCamera-a72d73cbac59db43d413291e4db66763be08143a.tar.gz
LegacyCamera-a72d73cbac59db43d413291e4db66763be08143a.tar.bz2
Add mode picker for camera/camcorder/panaramo
+remove camera switcher +add menu item for panorama bug:5039225 Change-Id: Ib065074026760f7dc1bd1dfe694935f46bb8c407
Diffstat (limited to 'res/layout-w1024dp')
-rw-r--r--res/layout-w1024dp/camera_control.xml30
-rw-r--r--res/layout-w1024dp/mode_picker.xml54
-rw-r--r--res/layout-w1024dp/pano_control.xml37
3 files changed, 92 insertions, 29 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml
index 5c2b3b5..2bcc6e5 100644
--- a/res/layout-w1024dp/camera_control.xml
+++ b/res/layout-w1024dp/camera_control.xml
@@ -60,34 +60,6 @@
android:layout_height="wrap_content" />
</com.android.camera.ui.IndicatorWheel>
- <com.android.camera.SwitcherSet android:id="@+id/camera_switch"
- android:visibility="invisible"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:padding="14dp"
- android:layout_marginRight="@dimen/mode_switcher_margin_right"
- android:layout_marginBottom="@dimen/mode_switcher_margin_bottom">
- <com.android.camera.ui.RotateImageView
- android:id="@+id/video_switch_icon"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:src="@drawable/btn_ic_mode_switch_video"/>
- <com.android.camera.HorizontalSwitcher android:id="@+id/switcher"
- android:layout_width="50dp"
- android:layout_height="18dp"
- android:layout_marginLeft="@dimen/mode_switcher_inner_margin"
- android:layout_marginRight="@dimen/mode_switcher_inner_margin"
- android:src="@drawable/toggle_switch_control_holo_dark"
- android:background="@drawable/toggle_switch_bg_holo_dark" />
- <com.android.camera.ui.RotateImageView
- android:id="@+id/camera_switch_icon"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:src="@drawable/btn_ic_mode_switch_camera"/>
- </com.android.camera.SwitcherSet>
+ <include layout="@layout/mode_picker"/>
</RelativeLayout>
diff --git a/res/layout-w1024dp/mode_picker.xml b/res/layout-w1024dp/mode_picker.xml
new file mode 100644
index 0000000..90cc008
--- /dev/null
+++ b/res/layout-w1024dp/mode_picker.xml
@@ -0,0 +1,54 @@
+<?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.
+-->
+<com.android.camera.ModePicker xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/mode_picker"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="72dp"
+ android:layout_marginRight="72dp"
+ android:layout_centerHorizontal="true"
+ android:layout_alignParentBottom="true">
+ <com.android.camera.ui.RotateImageView android:id="@+id/current_mode"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:background="@drawable/btn_mode_background"
+ android:src="@drawable/btn_ic_camera" />
+ <LinearLayout android:id="@+id/mode_selection"
+ android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:background="@android:color/black"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentBottom="true"
+ android:gravity="center"
+ android:visibility="invisible">
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_panorama"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:src="@drawable/btn_ic_panorama" />
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_video"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:src="@drawable/btn_ic_video" />
+ <com.android.camera.ui.RotateImageView android:id="@+id/mode_camera"
+ android:layout_height="62dp"
+ android:layout_width="62dp"
+ android:src="@drawable/btn_ic_camera" />
+ </LinearLayout>
+</com.android.camera.ModePicker>
+
diff --git a/res/layout-w1024dp/pano_control.xml b/res/layout-w1024dp/pano_control.xml
new file mode 100644
index 0000000..1882ff6
--- /dev/null
+++ b/res/layout-w1024dp/pano_control.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_height="match_parent"
+ android:layout_width="@dimen/camera_control_width"
+ android:layout_alignParentRight="true">
+
+ <include layout="@layout/review_thumbnail"/>
+
+ <com.android.camera.ShutterButton android:id="@+id/pano_shutter_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="32dp"
+ android:scaleType="center"
+ android:clickable="true"
+ android:focusable="true"
+ android:src="@drawable/btn_ic_camera_shutter"
+ android:background="@drawable/btn_shutter"/>
+
+ <include layout="@layout/mode_picker"/>
+</RelativeLayout>