Merge "[Work profile] Fix flickering work mode switch" into sc-v2-dev (3aae069e) · Commits · e / os / android_packages_apps_Trebuchet

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -491,6 +491,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
		mViewPager.initParentViews(this);
		mViewPager.getPageIndicator().setOnActivePageChangedListener(this);
		mWorkManager.attachWorkModeSwitch();
		mWorkManager.getWorkModeSwitch().post(() -> mAH[AdapterHolder.WORK].applyPadding());
		} else {
		mWorkManager.detachWorkModeSwitch();
		mViewPager = null;

+5 −4

Original line number	Diff line number	Diff line
		@@ -113,11 +113,13 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
		/**
		* Sets the enabled or disabled state of the button
		*/
		public void updateCurrentState(boolean active) {
		public void updateCurrentState(boolean isEnabled) {
		removeFlag(FLAG_PROFILE_TOGGLE_ONGOING);
		mWorkEnabled = active;
		if (mWorkEnabled != isEnabled) {
		mWorkEnabled = isEnabled;
		updateVisibility();
		}
		}


		private void updateVisibility() {
		@@ -125,7 +127,6 @@ public class WorkModeSwitch extends Button implements Insettable, View.OnClickLi
		if (mWorkEnabled && mOnWorkTab) {
		setFlag(FLAG_FADE_ONGOING);
		setVisibility(VISIBLE);
		setAlpha(0);
		animate().alpha(1).withEndAction(() -> removeFlag(FLAG_FADE_ONGOING)).start();
		} else if (getVisibility() != GONE) {
		setFlag(FLAG_FADE_ONGOING);

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public class UserManagerState {
		* Initialises the state values for all users
		*/
		public void init(UserCache userCache, UserManager userManager) {
		for (UserHandle user : userCache.getUserProfiles()) {
		for (UserHandle user : userManager.getUserProfiles()) {
		long serialNo = userCache.getSerialNumberForUser(user);
		boolean isUserQuiet = userManager.isQuietModeEnabled(user);
		allUsers.put(serialNo, user);