commit f24418e7b6d35d82b5e6e167c04fa80af259d6f4
author Chuck Liao <chuckliao@google.com> Sun May 10 02:29:44 2020 +0800
committer Chuck Liao <chuckliao@google.com> Mon May 11 14:11:55 2020 +0800
tree d862416caaae9d390ec76ad215454b1554ca69a1
parent 829d4d26c34101081092fa45a40cefe8d90f8be2

When the user select a wallpaper and then click back key in SUW, it should become unselect state instead of going back to previous page.

Bug: 156205781
Change-Id: I52fccea7a730858d1971d5cbde367d4d39b2f6fe

src/com/android/wallpaper/picker/TopLevelPickerActivity.java

diff --git a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
index 01c4001..482b77e 100755
--- a/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
+++ b/src/com/android/wallpaper/picker/TopLevelPickerActivity.java
@@ -228,6 +228,12 @@
 
     @Override
     public void onBackPressed() {
+        Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.fragment_container);
+        if (fragment instanceof BottomActionBarFragment
+                && ((BottomActionBarFragment) fragment).onBackPressed()) {
+            return;
+        }
+
         CategoryFragment categoryFragment = getCategoryFragment();
         if (categoryFragment != null && categoryFragment.popChildFragment()) {
             return;