commit f17c581165761232a9c142e71535078c82d948f3
author Brandon Dayauon <brdayauon@google.com> Mon Sep 12 19:15:20 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 12 19:15:20 2022 +0000
tree 61746b4dd650b01b13c4726b576f02274a2f479a
parent 7d8ba14b3cd496d5d8801a9b3b4f0ad58cc4e0e4
parent fa6011fcdf73ad1cee81bc2fdc2bacb246688daf

Merge "Work toggle button staying at the top when moving keyboard down" into tm-qpr-dev

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