commit 51819e8072cc7c01f704fab1d19b9bc359e7d528
author Wenyi Wang <wenyiw@google.com> Mon Sep 12 11:57:51 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Mon Sep 12 11:57:51 2016 -0700
tree efa855b7c0dd4a41aebd03b5aca0ca4c55fa98f8
parent f639b7c673c148a8f8e0a5a73d9ceaa424385805

Dismiss promo when Back button is pressed (1/2)

Bug: 30930004

Test: see http://ag/1432879
Change-Id: I6a477ced7fb4ac53900c04b0d5c70a8f8714745a

src-bind/com/android/contactsbind/FeatureHighlightHelper.java

diff --git a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
index c246141..be1833d 100644
--- a/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
+++ b/src-bind/com/android/contactsbind/FeatureHighlightHelper.java
@@ -26,4 +26,8 @@
     public static boolean showHamburgerFeatureHighlight(final FragmentActivity activity) {
         return false;
     }
+
+    public static boolean tryRemoveHighlight(final FragmentActivity activity) {
+        return false;
+    }
 }

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 7358fb7..ddfeb3a 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1378,6 +1378,8 @@
 
         if (mDrawer.isDrawerOpen(GravityCompat.START)) {
             mDrawer.closeDrawer(GravityCompat.START);
+        } else if (FeatureHighlightHelper.tryRemoveHighlight(this)) {
+            return;
         } else if (mActionBarAdapter.isSelectionMode()) {
             mActionBarAdapter.setSelectionMode(false);
             mAllFragment.displayCheckBoxes(false);