Merge "Fix "Pause work apps" button in strange location" into udc-dev (05204590) · Commits · e / os / android_packages_apps_Trebuchet

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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);

+5 −0

Original line number	Diff line number	Diff line
		@@ -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) {