Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev (79b56b06) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -233,14 +233,6 @@ public class NavbarButtonsViewController {
	mPropertyHolders.forEach(StatePropertyHolder::endAnimation);		mPropertyHolders.forEach(StatePropertyHolder::endAnimation);
	}		}

	public void onDestroy() {
	mPropertyHolders.clear();
	mControllers.rotationButtonController.unregisterListeners();
	if (mFloatingRotationButton != null) {
	mFloatingRotationButton.hide();
	}
	}

	private void initButtons(ViewGroup navContainer, ViewGroup endContainer,		private void initButtons(ViewGroup navContainer, ViewGroup endContainer,
	TaskbarNavButtonController navButtonController) {		TaskbarNavButtonController navButtonController) {

	@@ -466,6 +458,14 @@ public class NavbarButtonsViewController {
	}		}
	}		}

			public void onDestroy() {
			mPropertyHolders.clear();
			mControllers.rotationButtonController.unregisterListeners();
			if (mFloatingRotationButton != null) {
			mFloatingRotationButton.hide();
			}
			}

	private class RotationButtonListener implements RotationButton.RotationButtonUpdatesCallback {		private class RotationButtonListener implements RotationButton.RotationButtonUpdatesCallback {
	@Override		@Override
	public void onVisibilityChanged(boolean isVisible) {		public void onVisibilityChanged(boolean isVisible) {

quickstep/src/com/android/quickstep/views/OverviewActionsView.java

+3 −35

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,6 @@

	package com.android.quickstep.views;		package com.android.quickstep.views;

	import static com.android.quickstep.SysUINavigationMode.Mode.THREE_BUTTONS;

	import android.content.Context;		import android.content.Context;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	import android.graphics.Rect;		import android.graphics.Rect;
	@@ -33,7 +31,6 @@ import androidx.annotation.Nullable;
	import com.android.launcher3.DeviceProfile;		import com.android.launcher3.DeviceProfile;
	import com.android.launcher3.Insettable;		import com.android.launcher3.Insettable;
	import com.android.launcher3.R;		import com.android.launcher3.R;
	import com.android.launcher3.uioverrides.ApiWrapper;
	import com.android.launcher3.util.MultiValueAlpha;		import com.android.launcher3.util.MultiValueAlpha;
	import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;		import com.android.launcher3.util.MultiValueAlpha.AlphaProperty;
	import com.android.quickstep.SysUINavigationMode;		import com.android.quickstep.SysUINavigationMode;
	@@ -153,7 +150,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
	public void setInsets(Rect insets) {		public void setInsets(Rect insets) {
	mInsets.set(insets);		mInsets.set(insets);
	updateVerticalMargin(SysUINavigationMode.getMode(getContext()));		updateVerticalMargin(SysUINavigationMode.getMode(getContext()));
	updatePaddingAndTranslations();		updateHorizontalPadding();
	}		}

	public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean enable) {		public void updateHiddenFlags(@ActionsHiddenFlags int visibilityFlags, boolean enable) {
	@@ -196,37 +193,8 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
	return mMultiValueAlpha.getProperty(INDEX_FULLSCREEN_ALPHA);		return mMultiValueAlpha.getProperty(INDEX_FULLSCREEN_ALPHA);
	}		}

	/**		private void updateHorizontalPadding() {
	* Aligns OverviewActionsView vertically with and offsets horizontal position based on
	* 3 button nav container in taskbar.
	*/
	private void updatePaddingAndTranslations() {
	boolean alignFor3ButtonTaskbar = mDp.isTaskbarPresent &&
	SysUINavigationMode.getMode(getContext()) == THREE_BUTTONS;
	if (alignFor3ButtonTaskbar) {
	// Add extra horizontal spacing
	int additionalPadding = ApiWrapper.getHotseatEndOffset(getContext());
	if (isLayoutRtl()) {
	setPadding(mInsets.left + additionalPadding, 0, mInsets.right, 0);
	} else {
	setPadding(mInsets.left, 0, mInsets.right + additionalPadding, 0);
	}

	// Align vertically, using taskbar height + mDp.taskbarOffsetY() to guestimate
	// where the button nav top is
	View startActionView = findViewById(R.id.action_screenshot);
	int marginBottom = getOverviewActionsBottomMarginPx(
	SysUINavigationMode.getMode(getContext()), mDp);
	int actionsTop = (mDp.heightPx - marginBottom - mInsets.bottom);
	int navTop = mDp.heightPx - (mDp.taskbarSize + mDp.getTaskbarOffsetY());
	int transY = navTop - actionsTop
	+ ((mDp.taskbarSize - startActionView.getHeight()) / 2);
	setTranslationY(transY);
	} else {
	setPadding(mInsets.left, 0, mInsets.right, 0);		setPadding(mInsets.left, 0, mInsets.right, 0);
	setTranslationX(0);
	setTranslationY(0);
	}
	}		}

	/** Updates vertical margins for different navigation mode or configuration changes. */		/** Updates vertical margins for different navigation mode or configuration changes. */

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1148,7 +1148,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
	for (int i = 0; i < taskCount; i++) {		for (int i = 0; i < taskCount; i++) {
	View v = getTaskViewAt(i);		View v = getTaskViewAt(i);
	if (!(v instanceof GroupedTaskView)) {		if (!(v instanceof GroupedTaskView)) {
	continue;		return;
	}		}
	GroupedTaskView gtv = (GroupedTaskView) v;		GroupedTaskView gtv = (GroupedTaskView) v;
	gtv.onTaskListVisibilityChanged(false);		gtv.onTaskListVisibilityChanged(false);