From 547d65c77296b4f2d164fdcf86a970a761b5bc89 Mon Sep 17 00:00:00 2001
From: Likai Ding <likaid@codeaurora.org>
Date: Thu, 2 Apr 2015 20:39:07 +0800
Subject: SnapdragonCamera: fix crash with persist.panel.orientation

The two layout files were only available in portrait mode. Make
them as default.

Change-Id: Iabc4caf1a5b5b015a097a914b489f412153eeec4
---
 res/layout-port/camera_controls.xml     | 114 --------------------------------
 res/layout-port/pano_review_control.xml |  33 ---------
 res/layout/camera_controls.xml          | 114 ++++++++++++++++++++++++++++++++
 res/layout/pano_review_control.xml      |  33 +++++++++
 4 files changed, 147 insertions(+), 147 deletions(-)
 delete mode 100644 res/layout-port/camera_controls.xml
 delete mode 100644 res/layout-port/pano_review_control.xml
 create mode 100644 res/layout/camera_controls.xml
 create mode 100644 res/layout/pano_review_control.xml

diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
deleted file mode 100644
index af47a13b6..000000000
--- a/res/layout-port/camera_controls.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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.
--->
-<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/camera_controls"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <View
-        android:id="@+id/blocker"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/switcher_size"
-        android:layout_gravity="bottom"
-        android:clickable="true" />
-
-    <include
-        android:layout_width="64dip"
-        android:layout_height="64dip"
-        android:layout_gravity="bottom|right"
-        android:layout_marginBottom="8dip"
-        android:layout_marginRight="-8dip"
-        layout="@layout/menu_indicators" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/menu"
-        style="@style/MenuButton"
-        android:contentDescription="@string/accessibility_menu_button"
-        android:src="@drawable/ic_settings" />
-
-    <com.android.camera.ui.ModuleSwitcher
-        android:id="@+id/camera_switcher"
-        style="@style/SwitcherButton"
-        android:layout_gravity="bottom|left"
-        android:layout_marginBottom="2dip"
-        android:contentDescription="@string/accessibility_mode_picker" />
-
-    <com.android.camera.ShutterButton
-        android:id="@+id/shutter_button"
-        android:layout_width="@dimen/shutter_size"
-        android:layout_height="@dimen/shutter_size"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="@dimen/shutter_offset"
-        android:clickable="true"
-        android:contentDescription="@string/accessibility_shutter_button"
-        android:focusable="true"
-        android:scaleType="fitCenter"
-        android:src="@drawable/btn_new_shutter" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/preview_thumb"
-        android:layout_width="@dimen/capture_size"
-        android:layout_height="@dimen/capture_size"
-        android:layout_gravity="top|right"
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/switch_photo_filmstrip"
-        android:scaleType="fitCenter" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/front_back_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/hdr_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/scene_mode_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/filter_mode_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/ts_makeup_switcher"
-        style="@style/ToggleButton" />
-
-    <LinearLayout
-        android:id="@+id/remaining_photos"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:orientation="horizontal"
-        android:visibility="gone" >
-
-        <TextView
-            android:id="@+id/remaining_photos_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@android:color/transparent"
-            android:textColor="@android:color/white"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/remaining_photos_image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/remaining_sheets"
-            android:visibility="gone" />
-    </LinearLayout>
-
-</com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/pano_review_control.xml b/res/layout-port/pano_review_control.xml
deleted file mode 100644
index eeb2ebee4..000000000
--- a/res/layout-port/pano_review_control.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <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"
-        android:scaleType="center"
-        style="@style/ReviewControlIcon"
-        android:contentDescription="@string/accessibility_review_cancel"
-        android:layout_gravity="center_horizontal|bottom"
-        android:src="@drawable/ic_menu_cancel_holo_light" />
-</merge>
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
new file mode 100644
index 000000000..af47a13b6
--- /dev/null
+++ b/res/layout/camera_controls.xml
@@ -0,0 +1,114 @@
+<?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.
+-->
+<com.android.camera.ui.CameraControls xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/camera_controls"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <View
+        android:id="@+id/blocker"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/switcher_size"
+        android:layout_gravity="bottom"
+        android:clickable="true" />
+
+    <include
+        android:layout_width="64dip"
+        android:layout_height="64dip"
+        android:layout_gravity="bottom|right"
+        android:layout_marginBottom="8dip"
+        android:layout_marginRight="-8dip"
+        layout="@layout/menu_indicators" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/menu"
+        style="@style/MenuButton"
+        android:contentDescription="@string/accessibility_menu_button"
+        android:src="@drawable/ic_settings" />
+
+    <com.android.camera.ui.ModuleSwitcher
+        android:id="@+id/camera_switcher"
+        style="@style/SwitcherButton"
+        android:layout_gravity="bottom|left"
+        android:layout_marginBottom="2dip"
+        android:contentDescription="@string/accessibility_mode_picker" />
+
+    <com.android.camera.ShutterButton
+        android:id="@+id/shutter_button"
+        android:layout_width="@dimen/shutter_size"
+        android:layout_height="@dimen/shutter_size"
+        android:layout_gravity="bottom|center_horizontal"
+        android:layout_marginBottom="@dimen/shutter_offset"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_shutter_button"
+        android:focusable="true"
+        android:scaleType="fitCenter"
+        android:src="@drawable/btn_new_shutter" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/preview_thumb"
+        android:layout_width="@dimen/capture_size"
+        android:layout_height="@dimen/capture_size"
+        android:layout_gravity="top|right"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/switch_photo_filmstrip"
+        android:scaleType="fitCenter" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/front_back_switcher"
+        style="@style/ToggleButton" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/hdr_switcher"
+        style="@style/ToggleButton" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/scene_mode_switcher"
+        style="@style/ToggleButton" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/filter_mode_switcher"
+        style="@style/ToggleButton" />
+
+    <com.android.camera.ui.RotateImageView
+        android:id="@+id/ts_makeup_switcher"
+        style="@style/ToggleButton" />
+
+    <LinearLayout
+        android:id="@+id/remaining_photos"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:orientation="horizontal"
+        android:visibility="gone" >
+
+        <TextView
+            android:id="@+id/remaining_photos_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:textColor="@android:color/white"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/remaining_photos_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/remaining_sheets"
+            android:visibility="gone" />
+    </LinearLayout>
+
+</com.android.camera.ui.CameraControls>
diff --git a/res/layout/pano_review_control.xml b/res/layout/pano_review_control.xml
new file mode 100644
index 000000000..eeb2ebee4
--- /dev/null
+++ b/res/layout/pano_review_control.xml
@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <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"
+        android:scaleType="center"
+        style="@style/ReviewControlIcon"
+        android:contentDescription="@string/accessibility_review_cancel"
+        android:layout_gravity="center_horizontal|bottom"
+        android:src="@drawable/ic_menu_cancel_holo_light" />
+</merge>
-- 
cgit v1.2.3