Merge "Bring back undo delete confirmation." into gb-ub-photos-carlsbad

3 files changed, 81 insertions, 37 deletions

diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 4281aac3d..80e6c4b3a 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -16,6 +16,7 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/camera_layout_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
@@ -24,43 +25,51 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <include layout="@layout/filmstrip_bottom_controls" />
-
-    <LinearLayout
-        android:id="@+id/pano_stitching_progress_panel"
+    <!--com.android.camera.ui.FitSystemUiFrameLayout-->
+    <FrameLayout
+        android:id="@+id/camera_above_filmstrip_layout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:paddingBottom="52dp"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:paddingTop="5dp"
-        android:visibility="gone"
-        android:orientation="vertical">
+        android:layout_height="match_parent" >
 
-        <TextView
-            android:id="@+id/pano_stitching_progress_text"
-            android:text="@string/pano_progress_text"
-            android:textColor="#ffffffff"
-            android:textSize="14dp"
-            android:shadowColor="#ff000000"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:paddingBottom="8dp"
-            android:visibility="visible"
-            android:layout_gravity="right"/>
+        <include layout="@layout/filmstrip_bottom_controls" />
 
-        <ProgressBar
-            android:id="@+id/pano_stitching_progress_bar"
-            style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
+        <LinearLayout
+            android:id="@+id/pano_stitching_progress_panel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="visible"
-            android:layout_gravity="bottom|center_horizontal" />
-    </LinearLayout>
+            android:layout_gravity="bottom|center_horizontal"
+            android:paddingBottom="52dp"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="5dp"
+            android:visibility="gone"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/pano_stitching_progress_text"
+                android:text="@string/pano_progress_text"
+                android:textColor="#ffffffff"
+                android:textSize="14dp"
+                android:shadowColor="#ff000000"
+                android:shadowDx="0"
+                android:shadowDy="0"
+                android:shadowRadius="2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:paddingBottom="8dp"
+                android:visibility="visible"
+                android:layout_gravity="right"/>
+
+            <ProgressBar
+                android:id="@+id/pano_stitching_progress_bar"
+                style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                android:layout_gravity="bottom|center_horizontal" />
+        </LinearLayout>
+    </FrameLayout>
+    <!--/com.android.camera.ui.FitSystemUiFrameLayout-->
 
 </FrameLayout>
diff --git a/res/layout/filmstrip_bottom_controls.xml b/res/layout/filmstrip_bottom_controls.xml
index 14f0ee9fd..5b049fe5e 100644
--- a/res/layout/filmstrip_bottom_controls.xml
+++ b/res/layout/filmstrip_bottom_controls.xml
@@ -20,9 +20,7 @@
     android:id="@+id/filmstrip_bottom_controls"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentLeft="true"
-    android:orientation="horizontal"
+    android:layout_gravity="bottom"
     android:padding="10dp"
     android:visibility="visible" >
 
@@ -65,4 +63,4 @@
         android:src="@drawable/ic_menu_tiny_planet"
         android:visibility="gone" />
 
-</com.android.camera.ui.FilmstripBottomControls>
\ No newline at end of file
+</com.android.camera.ui.FilmstripBottomControls>
diff --git a/res/layout/undo_bar.xml b/res/layout/undo_bar.xml
new file mode 100644
index 000000000..37701b199
--- /dev/null
+++ b/res/layout/undo_bar.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+<!-- This layout is shared by phone and tablet in portrait or landscape orientation. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/camera_undo_deletion_bar"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        android:layout_gravity="bottom"
+        style="@style/UndoBar">
+
+    <TextView android:text="@string/deleted"
+            style="@style/UndoBarTextAppearance"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="left|center_vertical" />
+
+    <View style="@style/UndoBarSeparator" />
+
+    <TextView android:id="@+id/camera_undo_deletion_button"
+            style="@style/UndoButton"
+            android:text="@string/undo"
+            android:drawableLeft="@drawable/ic_menu_revert_holo_dark"/>
+</LinearLayout>