Merge "Update hotseat QSB alpha after isQsbInline changes" into tm-qpr-dev am: aae5739511

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19536892

Change-Id: I4ed693f093859297e0a94fa4d8c684fc041f1fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2022-08-09 14:39:30 +00:00
committed by Automerger Merge Worker

View File

@@ -32,6 +32,7 @@ import androidx.annotation.Nullable;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.BaseQuickstepLauncher;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.LauncherState;
import com.android.launcher3.QuickstepTransitionManager;
import com.android.launcher3.Utilities;
@@ -48,6 +49,7 @@ import com.android.systemui.shared.recents.model.ThumbnailData;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.StringJoiner;
import java.util.function.Consumer;
import java.util.function.Supplier;
/**
@@ -92,6 +94,15 @@ import java.util.function.Supplier;
// We skip any view synchronizations during init/destroy.
private boolean mCanSyncViews;
private final Consumer<Float> mIconAlphaForHomeConsumer = alpha -> {
mLauncher.getHotseat().setIconsAlpha(alpha > 0 ? 0 : 1);
mLauncher.getHotseat().setQsbAlpha(
mLauncher.getDeviceProfile().isQsbInline && alpha > 0 ? 0 : 1);
};
private final DeviceProfile.OnDeviceProfileChangeListener mOnDeviceProfileChangeListener =
dp -> mIconAlphaForHomeConsumer.accept(mIconAlphaForHome.getValue());
private final StateManager.StateListener<LauncherState> mStateListener =
new StateManager.StateListener<LauncherState>() {
@@ -131,13 +142,7 @@ import java.util.function.Supplier;
.getTaskbarBackgroundAlpha();
MultiValueAlpha taskbarIconAlpha = mControllers.taskbarViewController.getTaskbarIconAlpha();
mIconAlphaForHome = taskbarIconAlpha.getProperty(ALPHA_INDEX_HOME);
mIconAlphaForHome.setConsumer(
alpha -> {
mLauncher.getHotseat().setIconsAlpha(alpha > 0 ? 0 : 1);
if (mLauncher.getDeviceProfile().isQsbInline) {
mLauncher.getHotseat().setQsbAlpha(alpha > 0 ? 0 : 1);
}
});
mIconAlphaForHome.setConsumer(mIconAlphaForHomeConsumer);
mIconAlignmentForResumedState.finishAnimation();
onIconAlignmentRatioChangedForAppAndHomeTransition();
@@ -150,6 +155,7 @@ import java.util.function.Supplier;
applyState(0);
mCanSyncViews = true;
mLauncher.addOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener);
}
public void onDestroy() {
@@ -164,6 +170,7 @@ import java.util.function.Supplier;
mLauncher.getStateManager().removeStateListener(mStateListener);
mCanSyncViews = true;
mLauncher.removeOnDeviceProfileChangeListener(mOnDeviceProfileChangeListener);
}
public Animator createAnimToLauncher(@NonNull LauncherState toState,