commit 1154bbabc1f174f7dca40d92f59d2b2731930b3a
author Brian Attwell <brianattwell@google.com> Tue Mar 03 14:59:05 2015 -0800
committer Brian Attwell <brianattwell@google.com> Tue Mar 03 23:52:11 2015 +0000
tree ef8d0333614ab80f55a625d849ec55fed8993028
parent e95ce440a7dd7277fbc4eb78c3d74b85fd55af2f

Exit selection mode after batch delete or merge

We still don't support this for batch shares. It difficult
to know whether a share intent was received or whether the
disambiguation dialog was cancelled. In order to do this,
you need to use a timer to guess whether the app has been
backgrounded or not. Since sharing is a non-destructive
action, I think it is almost appropriate to stay in selection
mode after sharing anyway.

Bug: 19549465
Change-Id: Ibb132504e7a19ba2866de84bca216d126e4fbfaa

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 d660f4f..115ee2a 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -426,11 +426,6 @@
     }
 
     @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
-    @Override
     protected void onDestroy() {
         mProviderStatusWatcher.removeListener(this);
 
@@ -1211,14 +1206,13 @@
         intent.putExtra(Intent.EXTRA_STREAM, uri);
         ImplicitIntentsUtil.startActivityOutsideApp(this, intent);
     }
-
     private void joinSelectedContacts() {
         JoinContactsDialogFragment.start(this, mAllFragment.getSelectedContactIds());
     }
 
     @Override
     public void onContactsJoined() {
-        mAllFragment.clearCheckBoxes();
+        mActionBarAdapter.setSelectionMode(false);
     }
 
     private void deleteSelectedContacts() {
@@ -1228,7 +1222,7 @@
 
     @Override
     public void onDeletionFinished() {
-        mAllFragment.clearCheckBoxes();
+        mActionBarAdapter.setSelectionMode(false);
     }
 
     @Override