commit 0dfbe0339c7319ad02edc34de3d50104f64de735
author Dave Santoro <dsantoro@google.com> Fri Apr 15 13:52:52 2011 -0700
committer Dave Santoro <dsantoro@google.com> Fri Apr 15 13:56:37 2011 -0700
tree dfb81d8c94c5bc7f2922724da379cf4dae7d5ea0
parent 9da1766b0e27b3a8fb9e05f0d47caeac182309b9

Fix menu after adding a contact on the phone.

Logic was assuming a tablet interface, and was misconfiguring the menu to
only contain a (broken) search option.

Change-Id: I3b6010f338c10da5b10d6d9863544fbf172cc60f

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

diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index d894cdb..066b862 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -105,7 +105,13 @@
     private boolean mSearchMode;
 
     private ContactBrowseListFragment mListFragment;
+
+    /**
+     * Whether we have a right-side contact pane for displaying contact info while browsing.
+     * Generally means "this is a tablet".
+     */
     private boolean mContactContentDisplayed;
+
     private ContactDetailFragment mDetailFragment;
     private DetailFragmentListener mDetailFragmentListener = new DetailFragmentListener();
 
@@ -838,7 +844,7 @@
 
             case SUBACTIVITY_EDIT_CONTACT:
             case SUBACTIVITY_NEW_CONTACT: {
-                if (resultCode == RESULT_OK) {
+                if (resultCode == RESULT_OK && mContactContentDisplayed) {
                     mRequest.setActionCode(ContactsRequest.ACTION_VIEW_CONTACT);
                     mListFragment.reloadDataAndSetSelectedUri(data.getData());
                 }