Merge "Remove SRI panorama" into gb-ub-photos-carlsbad

9 files changed, 0 insertions, 456 deletions

diff --git a/res/drawable/pano_direction_left_indicator.xml b/res/drawable/pano_direction_left_indicator.xml
deleted file mode 100644
index a0bfb0af3..000000000
--- a/res/drawable/pano_direction_left_indicator.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-              android:drawable="@drawable/ic_pan_left_indicator" />
-    <item android:drawable="@drawable/ic_pan_left_indicator_fast" />
-</selector>
diff --git a/res/drawable/pano_direction_right_indicator.xml b/res/drawable/pano_direction_right_indicator.xml
deleted file mode 100644
index c3ce37797..000000000
--- a/res/drawable/pano_direction_right_indicator.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-              android:drawable="@drawable/ic_pan_right_indicator" />
-    <item android:drawable="@drawable/ic_pan_right_indicator_fast" />
-</selector>
diff --git a/res/layout-land/pano_module_capture.xml b/res/layout-land/pano_module_capture.xml
deleted file mode 100644
index 26cbfb1ec..000000000
--- a/res/layout-land/pano_module_capture.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/camera_app"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_gravity="center"
-        android:orientation="horizontal">
-
-    <include layout="@layout/preview_frame_pano" />
-
-</LinearLayout>
diff --git a/res/layout-land/pano_review.xml b/res/layout-land/pano_review.xml
deleted file mode 100644
index ea65c26b5..000000000
--- a/res/layout-land/pano_review.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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"
-        android:id="@+id/pano_review_layout"
-        android:visibility="gone"
-        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="@dimen/pano_mosaic_surface_height" />
-
-    <RelativeLayout style="@style/PanoViewHorizontalBar">
-        <com.android.camera.ui.RotateLayout
-                android:id="@+id/pano_saving_progress_bar_layout"
-                android:layout_centerInParent="true"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content">
-            <com.android.camera.PanoProgressBar
-                    android:id="@+id/pano_saving_progress_bar"
-                    android:src="@drawable/ic_pan_progression"
-                    android:layout_centerInParent="true"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content" />
-        </com.android.camera.ui.RotateLayout>
-
-        <com.android.camera.ui.RotateImageView android:id="@+id/pano_review_cancel_button"
-                style="@style/ReviewControlIcon"
-                android:contentDescription="@string/accessibility_review_cancel"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_centerHorizontal="false"
-                android:src="@drawable/ic_menu_cancel_holo_light" />
-    </RelativeLayout>
-</LinearLayout>
diff --git a/res/layout-land/preview_frame_pano.xml b/res/layout-land/preview_frame_pano.xml
deleted file mode 100644
index bd05f9a8f..000000000
--- a/res/layout-land/preview_frame_pano.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/frame_layout"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
-    <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>
-
-        <com.android.camera.ui.LayoutNotifyView
-                android:id="@+id/pano_preview_area"
-                android:visibility="invisible"
-                android:background="@drawable/ic_pan_border_fast"
-                android:layout_gravity="center"
-                android:layout_weight="5"
-                android:layout_width="match_parent"
-                android:layout_height="0dp" />
-
-        <!-- The bottom bar with progress bar and direction indicators -->
-        <RelativeLayout style="@style/PanoViewHorizontalBar">
-
-            <com.android.camera.ui.RotateLayout
-                    android:id="@+id/pano_pan_progress_bar_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true">
-                <com.android.camera.PanoProgressBar
-                        android:id="@+id/pano_pan_progress_bar"
-                        android:visibility="gone"
-                        android:src="@drawable/ic_pan_progression"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />
-            </com.android.camera.ui.RotateLayout>
-            <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_layout"
-                    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_layout"
-                    android:layout_centerVertical="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-        </RelativeLayout>
-
-    </LinearLayout>
-
-    <!-- The hint for "Too fast" text view -->
-    <com.android.camera.ui.RotateLayout
-            android:id="@+id/pano_capture_too_fast_textview_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
-        <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:visibility="gone" />
-    </com.android.camera.ui.RotateLayout>
-</RelativeLayout>
diff --git a/res/layout-port/pano_module_capture.xml b/res/layout-port/pano_module_capture.xml
deleted file mode 100644
index d9c9877a2..000000000
--- a/res/layout-port/pano_module_capture.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/camera_app"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:orientation="vertical">
-
-    <include layout="@layout/preview_frame_pano" />
-
-</LinearLayout>
diff --git a/res/layout-port/pano_review.xml b/res/layout-port/pano_review.xml
deleted file mode 100644
index b2e3d8dad..000000000
--- a/res/layout-port/pano_review.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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: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" />
-
-        <com.android.camera.ui.RotateLayout
-                android:id="@+id/pano_rotate_reviewarea"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1.5">
-            <ImageView android:id="@+id/pano_reviewarea"
-                    android:scaleType="fitCenter"
-                    android:layout_height="match_parent"
-                    android:layout_width="match_parent" />
-        </com.android.camera.ui.RotateLayout>
-
-        <View style="@style/PanoViewHorizontalBar"/>
-    </LinearLayout>
-
-    <com.android.camera.ui.RotateLayout
-            android:id="@+id/pano_saving_progress_bar_layout"
-            android:layout_centerHorizontal="true"
-            android:layout_above="@+id/shutter_button_placeholder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-        <com.android.camera.PanoProgressBar
-                android:id="@+id/pano_saving_progress_bar"
-                android:src="@drawable/ic_pan_progression"
-                android:layout_centerInParent="true"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content" />
-    </com.android.camera.ui.RotateLayout>
-
-    <ImageView android:id="@id/shutter_button_placeholder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="@dimen/shutter_offset"
-            android:visibility="invisible"
-            android:layout_gravity="center"
-            android:src="@drawable/btn_shutter_default"/>
-
-    <com.android.camera.ui.RotateImageView android:id="@id/pano_review_cancel_button"
-            style="@style/ReviewControlIcon"
-            android:contentDescription="@string/accessibility_review_cancel"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="false"
-            android:src="@drawable/ic_menu_cancel_holo_light" />
-</RelativeLayout>
diff --git a/res/layout-port/preview_frame_pano.xml b/res/layout-port/preview_frame_pano.xml
deleted file mode 100644
index 09d7899e7..000000000
--- a/res/layout-port/preview_frame_pano.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/frame_layout"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-    <LinearLayout android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:baselineAligned="false"
-            android:orientation="vertical">
-        <FrameLayout style="@style/PanoViewHorizontalBar">
-            <TextView android:id="@+id/pano_capture_indicator"
-                    android:text="@string/pano_capture_indication"
-                    android:textAppearance="?android:textAppearanceMedium"
-                    android:visibility="gone"
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-        </FrameLayout>
-
-        <com.android.camera.ui.LayoutNotifyView
-                android:id="@+id/pano_preview_area"
-                android:visibility="invisible"
-                android:background="@drawable/ic_pan_border_fast"
-                android:layout_gravity="center"
-                android:layout_weight="2"
-                android:layout_width="match_parent"
-                android:layout_height="0dp" />
-
-        <View style="@style/PanoViewHorizontalBar"/>
-    </LinearLayout>
-
-    <!-- The hint for "Too fast" text view -->
-    <com.android.camera.ui.RotateLayout
-            android:id="@+id/pano_capture_too_fast_textview_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true">
-        <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:visibility="gone" />
-    </com.android.camera.ui.RotateLayout>
-
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/placeholder">
-        <com.android.camera.ui.RotateLayout
-                android:id="@+id/pano_pan_progress_bar_layout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
-            <com.android.camera.PanoProgressBar
-                    android:id="@+id/pano_pan_progress_bar"
-                    android:visibility="gone"
-                    android:src="@drawable/ic_pan_progression"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-        </com.android.camera.ui.RotateLayout>
-
-        <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_layout"
-                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_layout"
-                android:layout_centerVertical="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-    </RelativeLayout>
-
-    <ImageView
-            android:id="@id/placeholder"
-            android:visibility="invisible"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="@dimen/shutter_offset"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/btn_shutter_default" />
-
-</RelativeLayout>
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml
deleted file mode 100644
index 9ecbd07f7..000000000
--- a/res/layout/panorama_module.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pano_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <include layout="@layout/pano_module_capture" />
-    <include layout="@layout/pano_review" />
-</merge>