From e7ee5bd608b44b123cca12a9f198118927a838c7 Mon Sep 17 00:00:00 2001
From: Minh Pham <phamm@google.com>
Date: Wed, 9 Nov 2011 11:21:47 -0800
Subject: [PATCH] Fix search UI

- Message list is collapsed by default in 7 inch and 10 inch portrait. It can cause confusion when searching.
- We should uncollapse the list in this case.
Bug: 5587501

Change-Id: I2a272e28e1cad7895049c4aa4ee1d8d2918efba9
---
 src/com/android/email/activity/ThreePaneLayout.java     | 3 +++
 src/com/android/email/activity/UIControllerTwoPane.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/com/android/email/activity/ThreePaneLayout.java b/src/com/android/email/activity/ThreePaneLayout.java
index 4564494a8..a28b3c8a2 100644
--- a/src/com/android/email/activity/ThreePaneLayout.java
+++ b/src/com/android/email/activity/ThreePaneLayout.java
@@ -294,6 +294,9 @@ public class ThreePaneLayout extends LinearLayout implements View.OnClickListene
 
         if (mPaneState == STATE_RIGHT_VISIBLE) {
             return changePaneState(STATE_MIDDLE_EXPANDED, true);
+        } else if (mInitialPaneState == STATE_RIGHT_VISIBLE) {
+            mInitialPaneState = STATE_MIDDLE_EXPANDED;
+            return true;
         }
 
         return false;
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index 5940818fc..85a700d51 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -337,6 +337,7 @@ class UIControllerTwoPane extends UIControllerBase implements ThreePaneLayout.Ca
             mThreePane.showRightPane();
         } else if (mListContext.isSearch()) {
             mThreePane.showRightPane();
+            mThreePane.uncollapsePane();
         } else {
             mThreePane.showLeftPane();
         }