diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java index 6ebab5a82d..6d7d1930fd 100644 --- a/src/com/android/launcher3/allapps/WorkProfileManager.java +++ b/src/com/android/launcher3/allapps/WorkProfileManager.java @@ -148,7 +148,7 @@ public class WorkProfileManager extends UserProfileManager if (getAH() != null) { getAH().applyPadding(); } - mWorkUtilityView.setOnClickListener(this::onWorkFabClicked); + mWorkUtilityView.getWorkFAB().setOnClickListener(this::onWorkFabClicked); return true; } /** diff --git a/src/com/android/launcher3/allapps/WorkUtilityView.java b/src/com/android/launcher3/allapps/WorkUtilityView.java index 4b58ab06dc..bfd96636e8 100644 --- a/src/com/android/launcher3/allapps/WorkUtilityView.java +++ b/src/com/android/launcher3/allapps/WorkUtilityView.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.graphics.Rect; import android.text.TextUtils; import android.util.AttributeSet; +import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; import android.widget.ImageButton; @@ -82,6 +83,7 @@ public class WorkUtilityView extends LinearLayout implements Insettable, // Threshold when user scrolls up/down to determine when should button extend/collapse private final int mScrollThreshold; private ValueAnimator mPauseFABAnim; + private View mWorkFAB; private TextView mPauseText; private ImageView mWorkIcon; private ImageButton mSchedulerButton; @@ -116,6 +118,7 @@ public class WorkUtilityView extends LinearLayout implements Insettable, mPauseText = findViewById(R.id.pause_text); mWorkIcon = findViewById(R.id.work_icon); + mWorkFAB = findViewById(R.id.work_mode_toggle); mSchedulerButton = findViewById(R.id.work_scheduler); setSelected(true); KeyboardInsetAnimationCallback keyboardInsetAnimationCallback = @@ -386,6 +389,10 @@ public class WorkUtilityView extends LinearLayout implements Insettable, return mScrollThreshold; } + public View getWorkFAB() { + return mWorkFAB; + } + public void updateStringFromCache(){ StringCache cache = mActivityContext.getStringCache(); if (cache != null) { diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/WorkProfileTest.java index d866a9f935..4dba78a899 100644 --- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/WorkProfileTest.java @@ -146,7 +146,7 @@ public class WorkProfileTest extends BaseLauncherActivityTest { executeOnLauncher(l -> { // Ensure updates are not deferred so notification happens when apps pause. l.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST); - l.getAppsView().getWorkManager().getWorkUtilityView().performClick(); + l.getAppsView().getWorkManager().getWorkUtilityView().getWorkFAB().performClick(); }); waitForLauncherCondition("Work profile toggle OFF failed", launcher -> {