PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Created a helper method that calculates the hotseat icons shift X.

Browse Source 
Moved out logic that computes the translation X for the hotseat icons.

Fixes: 368379159
Test: Manual. Have the hotseat adjusted. Open any application from the
hotseat bar. Go back to home.
Flag: EXEMPT refactoring

Change-Id: If9dfa70be537f87b075bd865e7f9c5cd1ae78f00
This commit is contained in:
mpodolian
2024-10-09 12:17:01 -07:00
parent 7153b179a9
commit 51e2bb31ed
4 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+5 -4
View File
@@ -23,7 +23,6 @@ import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
import static com.android.launcher3.LauncherAnimUtils.VIEW_ALPHA;
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;
import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;
import static com.android.launcher3.Utilities.isRtl;
import static com.android.launcher3.Utilities.mapRange;
import static com.android.launcher3.anim.AnimatedFloat.VALUE;
import static com.android.launcher3.anim.AnimatorListeners.forEndCallback;
@@ -938,10 +937,12 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
mTaskbarView.isDividerForRecents(), recentTaskIndex);
if (positionInHotseat == ERROR_POSITION_IN_HOTSEAT_NOT_FOUND) continue;
float hotseatAdjustedBorderSpace =
launcherDp.getHotseatAdjustedBorderSpaceForBubbleBar(child.getContext());
float hotseatIconCenter;
if (bubbleBarHasBubbles() && hotseatAdjustedBorderSpace != 0) {
if (launcherDp.shouldAdjustHotseatForBubbleBar(child.getContext(),
bubbleBarHasBubbles())) {
float hotseatAdjustedBorderSpace =
launcherDp.getHotseatAdjustedBorderSpaceForBubbleBar(child.getContext());
hotseatIconCenter = hotseatPadding.left + hotseatCellSize
+ (hotseatCellSize + hotseatAdjustedBorderSpace) * positionInHotseat
+ hotseatCellSize / 2f;
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+4 -9
View File
@@ -1108,15 +1108,10 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
translationX += mDeviceProfile
.getHotseatTranslationXForBubbleBar(isBubblesOnLeft, isRtl);
}
if (isBubbleBarEnabled() && hasBubbles()) {
// TODO(368379159) : create a class to reuse computation logic
float adjustedBorderSpace =
mDeviceProfile.getHotseatAdjustedBorderSpaceForBubbleBar(this);
if (Float.compare(adjustedBorderSpace, 0f) != 0) {
float borderSpaceDelta = adjustedBorderSpace - mDeviceProfile.hotseatBorderSpace;
translationX +=
(int) (mDeviceProfile.iconSizePx + itemInfo.cellX * borderSpaceDelta);
}
if (isBubbleBarEnabled()
&& mDeviceProfile.shouldAdjustHotseatForBubbleBar(getContext(), hasBubbles())) {
translationX += (int) mDeviceProfile
.getHotseatAdjustedTranslation(getContext(), itemInfo.cellX);
}
return translationX;
}
src/com/android/launcher3/DeviceProfile.java
+32 -10
View File
@@ -1829,19 +1829,14 @@ public class DeviceProfile {
* Returns the new border space that should be used between hotseat icons after adjusting it to
* the bubble bar.
*
* <p>Does not check for visible bubbles persistence, so caller should call
* {@link #shouldAdjustHotseatForBubbleBar} first.
*
* <p>If there's no adjustment needed, this method returns {@code 0}.
* @see #shouldAdjustHotseatForBubbleBar(Context, boolean)
*/
public float getHotseatAdjustedBorderSpaceForBubbleBar(Context context) {
// only need to adjust when QSB is on top of the hotseat.
if (isQsbInline) {
return 0;
}
// no need to adjust if there's enough space for the bubble bar to the right of the hotseat.
if (getHotseatLayoutPadding(context).right > mBubbleBarSpaceThresholdPx) {
return 0;
}
if (!shouldAdjustHotseatForBubbleBar(context)) return 0;
// The adjustment is shrinking the hotseat's width by 1 icon on either side.
int iconsWidth =
iconSizePx * numShownHotseatIcons + hotseatBorderSpace * (numShownHotseatIcons - 1);
@@ -1850,6 +1845,33 @@ public class DeviceProfile {
return (float) (newWidth - iconSizePx * numShownHotseatIcons) / (numShownHotseatIcons - 1);
}
/**
* Returns the hotseat icon translation X for the cellX index.
*
* <p>Does not check for visible bubbles persistence, so caller should call
* {@link #shouldAdjustHotseatForBubbleBar} first.
*
* <p>If there's no adjustment needed, this method returns {@code 0}.
* @see #shouldAdjustHotseatForBubbleBar(Context, boolean)
*/
public float getHotseatAdjustedTranslation(Context context, int cellX) {
if (!shouldAdjustHotseatForBubbleBar(context)) return 0;
float borderSpace = getHotseatAdjustedBorderSpaceForBubbleBar(context);
float borderSpaceDelta = borderSpace - hotseatBorderSpace;
return iconSizePx + cellX * borderSpaceDelta;
}
/** Returns whether hotseat should be adjusted for the bubble bar. */
public boolean shouldAdjustHotseatForBubbleBar(Context context, boolean hasBubbles) {
return hasBubbles && shouldAdjustHotseatForBubbleBar(context);
}
private boolean shouldAdjustHotseatForBubbleBar(Context context) {
// only need to adjust if bubble bar is enabled, when QSB is on top of the hotseat and
// there's not enough space for the bubble bar to the right of the hotseat.
return !isQsbInline && getHotseatLayoutPadding(context).right <= mBubbleBarSpaceThresholdPx;
}
/**
* Returns the padding for hotseat view
*/
src/com/android/launcher3/Hotseat.java
+7 -11
View File
@@ -149,12 +149,9 @@ public class Hotseat extends CellLayout implements Insettable {
DeviceProfile dp = mActivity.getDeviceProfile();
if (bubbleBarEnabled) {
float adjustedBorderSpace = dp.getHotseatAdjustedBorderSpaceForBubbleBar(getContext());
if (hasBubbles && Float.compare(adjustedBorderSpace, 0f) != 0) {
getShortcutsAndWidgets().setTranslationProvider(cellX -> {
float borderSpaceDelta = adjustedBorderSpace - dp.hotseatBorderSpace;
return dp.iconSizePx + cellX * borderSpaceDelta;
});
if (dp.shouldAdjustHotseatForBubbleBar(getContext(), hasBubbles)) {
getShortcutsAndWidgets().setTranslationProvider(
cellX -> dp.getHotseatAdjustedTranslation(getContext(), cellX));
if (mQsb instanceof HorizontalInsettableView) {
HorizontalInsettableView insettableQsb = (HorizontalInsettableView) mQsb;
final float insetFraction = (float) dp.iconSizePx / dp.hotseatQsbWidth;
@@ -189,25 +186,24 @@ public class Hotseat extends CellLayout implements Insettable {
*/
public void adjustForBubbleBar(boolean isBubbleBarVisible) {
DeviceProfile dp = mActivity.getDeviceProfile();
float adjustedBorderSpace = dp.getHotseatAdjustedBorderSpaceForBubbleBar(getContext());
if (Float.compare(adjustedBorderSpace, 0f) == 0) {
if (!dp.shouldAdjustHotseatForBubbleBar(getContext(), isBubbleBarVisible)) {
return;
}
ShortcutAndWidgetContainer icons = getShortcutsAndWidgets();
AnimatorSet animatorSet = new AnimatorSet();
float borderSpaceDelta = adjustedBorderSpace - dp.hotseatBorderSpace;
// update the translation provider for future layout passes of hotseat icons.
if (isBubbleBarVisible) {
icons.setTranslationProvider(cellX -> dp.iconSizePx + cellX * borderSpaceDelta);
icons.setTranslationProvider(
cellX -> dp.getHotseatAdjustedTranslation(getContext(), cellX));
} else {
icons.setTranslationProvider(null);
}
for (int i = 0; i < icons.getChildCount(); i++) {
View child = icons.getChildAt(i);
float tx = isBubbleBarVisible ? dp.iconSizePx + i * borderSpaceDelta : 0;
float tx = isBubbleBarVisible ? dp.getHotseatAdjustedTranslation(getContext(), i) : 0;
if (child instanceof Reorderable) {
MultiTranslateDelegate mtd = ((Reorderable) child).getTranslateDelegate();
animatorSet.play(