commit 5a94c88da21bfdfadb2ee2e4d18bbce96df4b92a
author Mindy Pereira <mindyp@google.com> Thu Feb 02 08:53:09 2012 -0800
committer Mindy Pereira <mindyp@google.com> Thu Feb 02 08:54:35 2012 -0800
tree 6e5d82c510d3988715dd9866b2751c0c6e2d28cd
parent dd10bc8736282262da0cd9a5f9a0236c10b47028

Make undo show ABOVE the list.

RelativeLayout being funny.

Change-Id: Id8344fb75d3c3ebeefea80f1bc7b853de6e1c07d

res/layout/conversation_list_activity.xml

diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index f230c32..27565e4 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -15,35 +15,30 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:orientation="vertical">
+    android:layout_width="match_parent">
 
     <Spinner android:id="@+id/accounts_spinner"
         android:layout_height="wrap_content"
-        android:layout_width="match_parent">
+        android:layout_width="match_parent"
+        android:layout_alignParentTop="true">
     </Spinner>
 
-    <RelativeLayout
+    <com.android.mail.ui.AnimatedListView
+        android:id="@+id/browse_list"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_width="match_parent">
+        android:layout_below="@id/accounts_spinner">
+    </com.android.mail.ui.AnimatedListView>
 
-        <com.android.mail.ui.AnimatedListView
-            android:id="@+id/browse_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentTop="true">
-        </com.android.mail.ui.AnimatedListView>
+    <com.android.mail.ui.UndoBarView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:id="@+id/undo_view"
+        android:layout_alignParentBottom="true">
+        <include layout="@layout/undo_bar"/>
+    </com.android.mail.ui.UndoBarView>
 
-        <com.android.mail.ui.UndoBarView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/undo_view"
-            android:layout_alignParentBottom="true">
-            <include layout="@layout/undo_bar"/>
-        </com.android.mail.ui.UndoBarView>
-
-    </RelativeLayout>
-</LinearLayout>
+</RelativeLayout>

src/com/android/mail/ui/UndoBarView.java

diff --git a/src/com/android/mail/ui/UndoBarView.java b/src/com/android/mail/ui/UndoBarView.java
index 52911b2..1b0d869 100644
--- a/src/com/android/mail/ui/UndoBarView.java
+++ b/src/com/android/mail/ui/UndoBarView.java
@@ -110,16 +110,14 @@
                         c.close();
                     }
                 }
-                hide(true);
+                setVisibility(View.GONE);
             }
         });
-        mStartShowTime = SystemClock.uptimeMillis();
-        mHidden = false;
         mUndoDescriptionView.setText(Html.fromHtml(description));
         mUndoDescriptionView.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View widget) {
-                hide(true);
+                setVisibility(View.GONE);
             }
         });
         setVisibility(View.VISIBLE);