commit e664cbebfc166627f9755ae45026bc8c0a6d207b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 28 00:04:31 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 28 00:04:31 2020 +0000
tree 2e530b99f360e3545f549093d40310c1f315f5af
parent 5e8ccd2bfa5f000eab7847a30e8aa572e03842c9
parent 20aabaf2f5acd033f112230fe542b555f2a0f9cb

Merge "Fix a Talkback problem of BottomActionBar and BottomNavigationView" into ub-launcher3-master

src/com/android/customization/picker/grid/GridFragment.java

diff --git a/src/com/android/customization/picker/grid/GridFragment.java b/src/com/android/customization/picker/grid/GridFragment.java
index eac1527..43eb82f 100644
--- a/src/com/android/customization/picker/grid/GridFragment.java
+++ b/src/com/android/customization/picker/grid/GridFragment.java
@@ -18,7 +18,6 @@
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 
 import static com.android.wallpaper.widget.BottomActionBar.BottomAction.APPLY;
-import static com.android.wallpaper.widget.BottomActionBar.BottomAction.CANCEL;
 
 import android.app.Activity;
 import android.content.Context;
@@ -208,7 +207,7 @@
     @Override
     protected void onBottomActionBarReady(BottomActionBar bottomActionBar) {
         mBottomActionBar = bottomActionBar;
-        mBottomActionBar.showActionsOnly(CANCEL, APPLY);
+        mBottomActionBar.showActionsOnly(APPLY);
         mBottomActionBar.setActionClickListener(APPLY, unused -> {
             mBottomActionBar.disableActions();
             mGridManager.apply(mSelectedOption, mApplyGridCallback);