commit fa6011fcdf73ad1cee81bc2fdc2bacb246688daf
author Brandon Dayauon <brdayauon@google.com> Fri Sep 09 15:04:42 2022 -0700
committer Brandon Dayauon <brdayauon@google.com> Fri Sep 09 15:04:42 2022 -0700
tree c57c68bef4f6a3215fabf8ee1b0972e44792a482
parent 94a54203f3e770099e36b1a7ff6aa3d6576ddec3

Work toggle button staying at the top when moving keyboard down

- Same fix from implementation when implementing extendedFAB. ag/19223926
- Essentiall remove isEnabled() check since it is not needed
bug: 235873194
test: Manual - before: https://drive.google.com/file/d/1JjDSudWS56fiDyMnP8Btvy0pWFyUIXND/view?usp=sharing
after: https://drive.google.com/file/d/1Ja-OVpXKK1yUrixpU_V6WsLV0Ryw152w/view?usp=sharing

Change-Id: Ibca405deccfcd61845dd4f5952ad196af1ab3fe2

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

diff --git a/src/com/android/launcher3/allapps/WorkModeSwitch.java b/src/com/android/launcher3/allapps/WorkModeSwitch.java
index fedc91f..a589448 100644
--- a/src/com/android/launcher3/allapps/WorkModeSwitch.java
+++ b/src/com/android/launcher3/allapps/WorkModeSwitch.java
@@ -170,12 +170,14 @@
 
     @Override
     public WindowInsets onApplyWindowInsets(WindowInsets insets) {
-        if (Utilities.ATLEAST_R && isEnabled()) {
+        if (!Utilities.ATLEAST_R) {
+            return insets;
+        }
+        if (insets.isVisible(WindowInsets.Type.ime())) {
+            Insets keyboardInsets = insets.getInsets(WindowInsets.Type.ime());
+            setTranslationY(mInsets.bottom - keyboardInsets.bottom);
+        } else {
             setTranslationY(0);
-            if (insets.isVisible(WindowInsets.Type.ime())) {
-                Insets keyboardInsets = insets.getInsets(WindowInsets.Type.ime());
-                setTranslationY(mInsets.bottom - keyboardInsets.bottom);
-            }
         }
         return insets;
     }