De-overlap of undo bar and filmstrip controls.

bug:12958725

Change-Id: Iaaf31ae02e9f1975b8c3ec20fea2b6da36208278

diff --git a/res/layout/undo_bar.xml b/res/layout/undo_bar.xml
index 37701b1..19a4247 100644 (file)
--- a/res/layout/undo_bar.xml
+++ b/res/layout/undo_bar.xml
@@ -18,7 +18,6 @@
         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"
@@ -26,6 +25,7 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
+            android:layout_marginRight="16dp"
             android:gravity="left|center_vertical" />
 
     <View style="@style/UndoBarSeparator" />

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 83a587a..90e7999 100644 (file)
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -241,12 +241,11 @@
         <item name="android:layout_height">match_parent</item>
     </style>
     <style name="UndoBar">
-        <item name="android:layout_marginLeft">4dp</item>
-        <item name="android:layout_marginRight">4dp</item>
+        <item name="android:layout_marginBottom">64dp</item>
         <item name="android:paddingLeft">16dp</item>
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">48dp</item>
-        <item name="android:layout_gravity">bottom</item>
+        <item name="android:layout_gravity">bottom|center_horizontal</item>
         <item name="android:background">@drawable/panel_undo_holo</item>
     </style>
     <style name="UndoBarTextAppearance">