Merge "Add white circle for hamburger promo inner icon." into ub-contactsdialer-f-dev
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index e4eef51..c8d8eb3 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -287,7 +287,7 @@
if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "Received group URI " + groupUri);
Toast.makeText(this, R.string.groupCreatedToast, Toast.LENGTH_SHORT).show();
startActivity(GroupUtil.createViewGroupIntent(this, groupUri, /* title */ null));
- if (this instanceof GroupMembersActivity) {
+ if (shouldFinish()) {
// If we created a group while viewing the members of an existing group (i.e.
// while on GroupMembersActivity), finish the current GroupMembersActivity so that
// hitting back from the new GroupMembersActivity that was just stared will open
diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java
index 4a731db..1d7fa46 100644
--- a/src/com/android/contacts/editor/CompactContactEditorFragment.java
+++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java
@@ -228,6 +228,10 @@
@Override
public void onEditorsBound() {
+ final Activity activity = getActivity();
+ if (activity == null || activity.isFinishing()) {
+ return;
+ }
getLoaderManager().initLoader(LOADER_GROUPS, null, mGroupsLoaderListener);
}