commit 44424572b4bb378995e138e2e5f89c6fcc3a1ca7
author Hyunyoung Song <hyunyoungs@google.com> Wed Jul 14 11:39:43 2021 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed Jul 14 15:09:26 2021 -0700
tree 23fc13e30c8aa0ce8f2f3cf3772bafaa0f9a1adb
parent d2182b242b236b1e1b1275322ce339bf5f6329aa

Fix work profile disable button falsing

Bug: 191996677

Test: before this CL: when tapping on immediately above keyboard when
keyboard is translating or when onApplyWindowInset is called, the
hidden (GONE) view handles touch and triggers work profile to be disabled.

After the CL, the button view is not attached to the parent container
when on personal tab. Also, the onApplyWindowInsets method translations
can only be called when work tab is selected.

Change-Id: Ib3e9a5c4b3280052f9ccb62a199ed256ae4e094f

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 516af59..d2c71b2 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -477,10 +477,6 @@
         } else {
             mAH[AdapterHolder.MAIN].setup(findViewById(R.id.apps_list_view), null);
             mAH[AdapterHolder.WORK].recyclerView = null;
-            if (mWorkModeSwitch != null) {
-                ((ViewGroup) mWorkModeSwitch.getParent()).removeView(mWorkModeSwitch);
-                mWorkModeSwitch = null;
-            }
         }
         setupHeader();
 
@@ -532,7 +528,7 @@
 
     @Override
     public void onActivePageChanged(int currentActivePage) {
-        mHeader.setMainActive(currentActivePage == 0);
+        mHeader.setMainActive(currentActivePage == AdapterHolder.MAIN);
         if (mAH[currentActivePage].recyclerView != null) {
             mAH[currentActivePage].recyclerView.bindFastScrollbar();
         }
@@ -541,6 +537,14 @@
             mWorkModeSwitch.setWorkTabVisible(currentActivePage == AdapterHolder.WORK
                     && mAllAppsStore.hasModelFlag(
                     FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION));
+
+            if (currentActivePage == AdapterHolder.WORK) {
+                if (mWorkModeSwitch.getParent() == null) {
+                    addView(mWorkModeSwitch);
+                }
+            } else {
+                removeView(mWorkModeSwitch);
+            }
         }
     }