commit be41323d24a57a60c9e90d55b8485f057d1abcb3
author Frank Sposaro <sposaro@google.com> Fri Jul 01 10:45:17 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 01 10:45:17 2011 -0700
tree 5ad20e544ce8be14ff6b9ae5236165da533be4da
parent 61caa5cae8be7f11d11f8410a6ce82f0ff1215aa
parent aa2dfcdf9e7a4701f3954413f1cd75b8e1a26910

Merge "Fix NPE in People App on phone when search is pressed."

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index e373a6b..0bec6cc 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -350,7 +350,7 @@
     private void setSelectedTab(TabState tab) {
         mSelectedTab = tab;
 
-        if (mFrequentFragment != null) {
+        if (mContentPaneDisplayed) {
             switch (mSelectedTab) {
                 case FAVORITES:
                     mFavoritesView.setVisibility(View.VISIBLE);
@@ -492,10 +492,13 @@
     public void onAction(Action action) {
         switch (action) {
             case START_SEARCH_MODE:
+                // Checking if multi fragments are being displayed
+                if (mContentPaneDisplayed) {
+                    mFavoritesView.setVisibility(View.GONE);
+                    mBrowserView.setVisibility(View.VISIBLE);
+                    mDetailsView.setVisibility(View.VISIBLE);
+                }
                 // Bring the contact list fragment (and detail fragment if applicable) to the front
-                mFavoritesView.setVisibility(View.GONE);
-                mBrowserView.setVisibility(View.VISIBLE);
-                mDetailsView.setVisibility(View.VISIBLE);
                 FragmentTransaction ft = getFragmentManager().beginTransaction();
                 ft.show(mContactsFragment);
                 if (mContactDetailFragment != null) ft.show(mContactDetailFragment);