commit 82c9033a8f17470a335dd85936479669b50e5877
author Walter Jang <wjang@google.com> Wed Feb 24 17:34:34 2016 -0800
committer Walter Jang <wjang@google.com> Thu Feb 25 16:00:51 2016 +0000
tree 987f3e1f08d9f55d2f5b02fe63edf4836e3896a6
parent a2b77d3fa44c3aae75869cf0892086b6558df3a3

Don't log search events when not in search mode

Bug 26697731

Change-Id: I482f1b8c18196b9f4b51bde9db3203f0f4f1fb87

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 5aab771..66d4f08 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -560,8 +560,7 @@
                 break;
             case ActionBarAdapter.Listener.Action.START_SEARCH_MODE:
                 if (!mIsRecreatedInstance) {
-                    Logger.getInstance().logScreenView(
-                            ScreenEvent.SEARCH, this, ScreenEvent.TAG_SEARCH);
+                    Logger.logScreenView(ScreenEvent.SEARCH, this, ScreenEvent.TAG_SEARCH);
                 }
                 startSearchOrSelectionMode();
                 break;
@@ -1367,9 +1366,8 @@
             if (mAllFragment.wasSearchResultClicked()) {
                 mAllFragment.resetSearchResultClicked();
             } else {
-                Logger.getInstance().logScreenView(
-                        ScreenEvent.SEARCH_EXIT, this, ScreenEvent.TAG_SEARCH_EXIT);
-                Logger.getInstance().logSearchEventImpl(mAllFragment.createSearchState());
+                Logger.logScreenView(ScreenEvent.SEARCH_EXIT, this, ScreenEvent.TAG_SEARCH_EXIT);
+                Logger.logSearchEvent(mAllFragment.createSearchState());
             }
         } else {
             super.onBackPressed();

src/com/android/contacts/list/MultiSelectContactsListFragment.java

diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index 639860e..76dd3f3 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -183,8 +183,10 @@
                 getAdapter().toggleSelectionOfContactId(Long.valueOf(contactId));
             }
         } else {
-            mSearchResultClicked = true;
-            Logger.logSearchEvent(createSearchStateForSearchResultClick(position));
+            if (isSearchMode()) {
+                mSearchResultClicked = true;
+                Logger.logSearchEvent(createSearchStateForSearchResultClick(position));
+            }
             super.onItemClick(position, id);
         }
         if (mCheckBoxListListener != null && getAdapter().getSelectedContactIds().size() == 0) {