Merge "intent captrue review gets its own ImageView! instead of relying on a stopped preview TextureView" into ub-camera-fishlake

4 files changed, 147 insertions, 48 deletions

diff --git a/res/layout-land/retake_done_cancel_layout.xml b/res/layout-land/retake_done_cancel_layout.xml
new file mode 100644
index 000000000..5a41f0bd6
--- /dev/null
+++ b/res/layout-land/retake_done_cancel_layout.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.ui.TopRightWeightedLayout
+    android:id="@+id/bottombar_intent_review"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:visibility="invisible"
+    android:background="@null" >
+      <ImageButton
+        android:id="@+id/cancel_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|center_vertical"
+        android:paddingTop="24dp"
+        android:src="@drawable/ic_cancel"
+        android:background="@null"
+        android:contentDescription="@string/cancel_button_description" />
+      <ImageButton
+        android:id="@+id/done_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_confirm"
+        android:layout_weight="1"
+        android:background="@null"
+        android:contentDescription="@string/done_button_description" />
+      <ImageButton
+        android:id="@+id/retake_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
+        android:paddingBottom="24dp"
+        android:src="@drawable/ic_back"
+        android:background="@null"
+        android:contentDescription="@string/retake_button_description" />
+  </com.android.camera.ui.TopRightWeightedLayout>
+</merge>
\ No newline at end of file
diff --git a/res/layout-port/retake_done_cancel_layout.xml b/res/layout-port/retake_done_cancel_layout.xml
new file mode 100644
index 000000000..13fbe413d
--- /dev/null
+++ b/res/layout-port/retake_done_cancel_layout.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.ui.TopRightWeightedLayout
+    android:id="@+id/bottombar_intent_review"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:gravity="center"
+    android:visibility="invisible"
+    android:background="@null" >
+      <ImageButton
+        android:id="@+id/retake_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
+        android:paddingLeft="24dp"
+        android:src="@drawable/ic_back"
+        android:background="@null"
+        android:contentDescription="@string/retake_button_description" />
+      <ImageButton
+        android:id="@+id/done_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:src="@drawable/ic_confirm"
+        android:layout_weight="1"
+        android:background="@null"
+        android:contentDescription="@string/done_button_description" />
+      <ImageButton
+        android:id="@+id/cancel_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|center_vertical"
+        android:paddingRight="24dp"
+        android:src="@drawable/ic_cancel"
+        android:background="@null"
+        android:contentDescription="@string/cancel_button_description" />
+  </com.android.camera.ui.TopRightWeightedLayout>
+</merge>
\ No newline at end of file
diff --git a/res/layout/bottom_bar_contents.xml b/res/layout/bottom_bar_contents.xml
index da9c0c452..5368f9c21 100644
--- a/res/layout/bottom_bar_contents.xml
+++ b/res/layout/bottom_bar_contents.xml
@@ -39,54 +39,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="visible" >
-    <ImageButton
-      android:id="@+id/shutter_cancel_button"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center"
-      android:scaleType="center"
-      android:clickable="true"
-      android:contentDescription="@string/accessibility_cancel_button"
-      android:focusable="true"
-      android:background="@null"
-      android:src="@drawable/ic_cancel" />
-  </FrameLayout>
-
-
-    <com.android.camera.ui.TopRightWeightedLayout
-      android:id="@+id/bottombar_intent_review"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="horizontal"
-      android:gravity="center"
-      android:visibility="invisible"
-      android:background="@null" >
-    <ImageButton
-        android:id="@+id/retake_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
-        android:paddingLeft="24dp"
-        android:src="@drawable/ic_back"
-        android:background="@null"
-        android:contentDescription="@string/retake_button_description" />
-    <ImageButton
-        android:id="@+id/done_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+      <ImageButton
+        android:id="@+id/shutter_cancel_button"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
-        android:src="@drawable/ic_confirm"
-        android:layout_weight="1"
-        android:background="@null"
-        android:contentDescription="@string/done_button_description" />
-    <ImageButton
-        android:id="@+id/cancel_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right|center_vertical"
-        android:paddingRight="24dp"
-        android:src="@drawable/ic_cancel"
+        android:scaleType="center"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_cancel_button"
+        android:focusable="true"
         android:background="@null"
-        android:contentDescription="@string/cancel_button_description" />
-  </com.android.camera.ui.TopRightWeightedLayout>
+        android:src="@drawable/ic_cancel" />
+  </FrameLayout>
+
+  <include layout="@layout/retake_done_cancel_layout" />
 </merge>
diff --git a/res/layout/intent_review_imageview.xml b/res/layout/intent_review_imageview.xml
new file mode 100644
index 000000000..9bd4a516c
--- /dev/null
+++ b/res/layout/intent_review_imageview.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/intent_review_imageview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scaleType="fitCenter"
+    android:background="@android:color/black"
+    android:visibility="invisible" />