commit 794dbd0aa20eb6f291750adf7e88b0d6163659d6
author Walter Jang <wjang@google.com> Thu Jul 28 13:53:13 2016 -0700
committer Walter Jang <wjang@google.com> Thu Jul 28 13:55:08 2016 -0700
tree 2cc538d1b41a33c195dc6f0a72203c67c7c4897c
parent b7b790b38fceb958d0207f5ceea5a628bd036c36

Exit selection mode before search on group member picker

This is the same order as the main contacts list activity
onBackPressed now so if you search, enter multi select mode,
then hit back, you go back to search mode.

Bug 30475739

Change-Id: Ib36b4a85951aace9a2268b90ae621507ee6e951b

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

diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index d1f05f6..ab25dc8 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -683,11 +683,11 @@
             return;
         }
 
-        if (mIsSearchMode) {
+        if (isSelectionMode()) {
+            mActionBarAdapter.setSelectionMode(false);
+        } else if (mIsSearchMode) {
             mIsSearchMode = false;
             configureSearchMode();
-        } else if (isSelectionMode()) {
-            mActionBarAdapter.setSelectionMode(false);
         } else {
             super.onBackPressed();
         }