commit 85104c6c8e076b77e5a4d7830a190478a6bfa08d
author Paul Westbrook <pwestbro@google.com> Wed Aug 22 08:44:05 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 08:44:05 2012 -0700
tree 8569454e0e1fb94cad8ae8f3f51f83cd073d45e9
parent eed092c6046db117076a48cbf7c2fdf8fdd9606b
parent 49c7f80747eac40316f225267dc0093978e5efe2

Merge "Use a separate view for the wait fragment" into jb-ub-mail

res/layout/two_pane_activity.xml

diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml
index 052a05f..0a3cfe2 100644
--- a/res/layout/two_pane_activity.xml
+++ b/res/layout/two_pane_activity.xml
@@ -66,6 +66,12 @@
 
         </FrameLayout>
     </com.android.mail.ui.TwoPaneLayout>
+    <RelativeLayout
+        android:id="@+id/wait"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:layout_gravity="center"/>
     <com.android.mail.ui.ActionableToastBar
         android:id="@+id/toast_bar"
         style="@style/ToastBarStyle" />

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

diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index b8af9be..506b0a0 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -293,7 +293,7 @@
         Fragment waitFragment = WaitFragment.newInstance(mAccount);
         FragmentTransaction fragmentTransaction = mActivity.getFragmentManager().beginTransaction();
         fragmentTransaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
-        fragmentTransaction.replace(R.id.two_pane_activity, waitFragment, TAG_WAIT);
+        fragmentTransaction.replace(R.id.wait, waitFragment, TAG_WAIT);
         fragmentTransaction.commitAllowingStateLoss();
     }