Merge "Fix "Pause work apps" button in strange location" into udc-dev

This commit is contained in:
Brandon Dayauon
2023-06-01 19:00:27 +00:00
committed by Android (Google) Code Review
3 changed files with 13 additions and 1 deletions

View File

@@ -444,6 +444,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
// Animate to A-Z with 0 time to reset the animation with proper state management.
animateToSearchState(false, 0);
}
if (isSearching()) {
mWorkManager.reset();
}
}
@Override

View File

@@ -166,7 +166,7 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
return super.onApplyWindowInsets(insets);
}
private void updateTranslationY() {
void updateTranslationY() {
setTranslationY(-mImeInsets.bottom);
}
@@ -180,6 +180,10 @@ public class WorkModeSwitch extends LinearLayout implements Insettable,
rect.set(insets.left, insets.top, insets.right, insets.bottom);
}
public Rect getImeInsets() {
return mImeInsets;
}
@Override
public void onTranslationStart() {
setFlag(FLAG_TRANSLATION_ONGOING);

View File

@@ -136,6 +136,11 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP
public void reset() {
boolean isEnabled = !mAllApps.getAppsStore().hasModelFlag(FLAG_QUIET_MODE_ENABLED);
updateCurrentState(isEnabled ? STATE_ENABLED : STATE_DISABLED);
if (mWorkModeSwitch != null) {
// reset the position of the button and clear IME insets.
mWorkModeSwitch.getImeInsets().setEmpty();
mWorkModeSwitch.updateTranslationY();
}
}
private void updateCurrentState(@WorkProfileState int currentState) {