Merge "Avoid crash when re-saving new contact with photo." into jb-dev
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 464075a..92152c8 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -343,7 +343,7 @@
final FragmentTransaction transaction = fragmentManager.beginTransaction();
// Prepare the fragments which are used both on 1-pane and on 2-pane.
- boolean isUsingTwoPanes = PhoneCapabilityTester.isUsingTwoPanes(this);
+ final boolean isUsingTwoPanes = PhoneCapabilityTester.isUsingTwoPanes(this);
if (isUsingTwoPanes) {
mFavoritesFragment = getFragment(R.id.favorites_fragment);
mAllFragment = getFragment(R.id.all_fragment);
@@ -437,6 +437,9 @@
mFavoritesFragment.enableQuickContact(true);
mFavoritesFragment.setDisplayType(DisplayType.STARRED_ONLY);
} else {
+ // For 2-pane in All and Groups but not in Favorites fragment, show the chevron
+ // for quick contact popup
+ mFavoritesFragment.enableQuickContact(isUsingTwoPanes);
mFavoritesFragment.setDisplayType(DisplayType.STREQUENT);
}