summaryrefslogtreecommitdiffstats
path: root/res/layout-port
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2013-08-19 15:06:12 -0700
committerAngus Kong <shkong@google.com>2013-09-04 13:10:29 -0700
commited15d1a140986473bbe7fffd72ec9618c41c5979 (patch)
treead5a3fdff05b54fef1ec076d5fa4c80e1a419888 /res/layout-port
parent269c824d720b2e902c4ad6c3bb23422644da1f41 (diff)
downloadandroid_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.gz
android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.tar.bz2
android_packages_apps_Snap-ed15d1a140986473bbe7fffd72ec9618c41c5979.zip
Bring back wide angle panorama.
bug:10293937 Change-Id: I23a977e87b7416f07ecac20025b6c142ae61be05
Diffstat (limited to 'res/layout-port')
-rw-r--r--res/layout-port/camera_controls.xml4
-rw-r--r--res/layout-port/pano_module_capture.xml96
-rw-r--r--res/layout-port/pano_module_review.xml60
3 files changed, 158 insertions, 2 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 5f89830c5..03e896bc0 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -40,7 +40,7 @@
android:layout_marginBottom="2dip"
android:contentDescription="@string/accessibility_menu_button" />
- <com.android.camera.ui.CameraSwitcher
+ <com.android.camera.ui.ModuleSwitcher
android:id="@+id/camera_switcher"
style="@style/SwitcherButton"
android:layout_gravity="bottom|left"
@@ -67,4 +67,4 @@
android:scaleType="centerInside"
android:layout_gravity="top|right" />
-</com.android.camera.ui.CameraControls> \ No newline at end of file
+</com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/pano_module_capture.xml b/res/layout-port/pano_module_capture.xml
new file mode 100644
index 000000000..57c00cded
--- /dev/null
+++ b/res/layout-port/pano_module_capture.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/panorama_capture_layout"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <!-- The top bar with capture indication -->
+ <FrameLayout style="@style/PanoViewHorizontalBar">
+ <TextView android:id="@+id/pano_capture_indicator"
+ android:text="@string/pano_capture_indication"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_gravity="center"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_gravity="center"
+ android:layout_weight="3"
+ android:layout_width="match_parent"
+ android:layout_height="0dp">
+ <TextureView
+ android:id="@+id/pano_preview_textureview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <View
+ android:id="@+id/pano_preview_area_border"
+ android:visibility="gone"
+ android:background="@drawable/ic_pan_border_fast"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </FrameLayout>
+
+ <!-- The bottom bar with progress bar and direction indicators -->
+ <RelativeLayout style="@style/PanoViewHorizontalBar">
+
+ <com.android.camera.PanoProgressBar
+ android:id="@+id/pano_pan_progress_bar"
+ android:visibility="gone"
+ android:src="@drawable/ic_pan_progression"
+ android:layout_centerInParent="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <ImageView
+ android:id="@+id/pano_pan_left_indicator"
+ android:src="@drawable/pano_direction_left_indicator"
+ android:visibility="gone"
+ android:layout_marginRight="5dp"
+ android:layout_toLeftOf="@id/pano_pan_progress_bar"
+ android:layout_centerVertical="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <ImageView
+ android:id="@+id/pano_pan_right_indicator"
+ android:src="@drawable/pano_direction_right_indicator"
+ android:visibility="gone"
+ android:layout_marginLeft="5dp"
+ android:layout_toRightOf="@id/pano_pan_progress_bar"
+ android:layout_centerVertical="true"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <!-- The hint for "Too fast" text view -->
+ <TextView android:id="@+id/pano_capture_too_fast_textview"
+ android:text="@string/pano_too_fast_prompt"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:visibility="gone" />
+</FrameLayout>
diff --git a/res/layout-port/pano_module_review.xml b/res/layout-port/pano_module_review.xml
new file mode 100644
index 000000000..3c5eb2cfc
--- /dev/null
+++ b/res/layout-port/pano_module_review.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/pano_review_layout"
+ android:visibility="gone"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+ <TextView style="@style/PanoViewHorizontalBar"
+ android:text="@string/pano_review_rendering"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:gravity="center" />
+
+ <ImageView android:id="@+id/pano_reviewarea"
+ android:scaleType="fitCenter"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1.5" />
+
+ <View style="@style/PanoViewHorizontalBar"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_horizontal|bottom">
+
+ <com.android.camera.PanoProgressBar
+ android:id="@+id/pano_saving_progress_bar"
+ android:src="@drawable/ic_pan_progression"
+ android:layout_gravity="center_horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content" />
+
+ <ImageView android:id="@id/pano_review_cancel_button"
+ style="@style/ReviewControlIcon"
+ android:contentDescription="@string/accessibility_review_cancel"
+ android:layout_gravity="center_horizontal"
+ android:src="@drawable/ic_menu_cancel_holo_light" />
+ </LinearLayout>
+</FrameLayout>