Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69935f06 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Dismiss promo when Back button is pressed (1/2)" into ub-contactsdialer-g-dev

parents b8db2184 51819e80

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

+4 −0
Original line number Diff line number Diff line
@@ -26,4 +26,8 @@ public final class FeatureHighlightHelper { 
    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

+2 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,8 @@ public class PeopleActivity extends ContactsDrawerActivity implements 


        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);