msemes/Flexera-Launcher
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds Blur and BlurFallback styles for All Apps.

Browse Source 
Technically these styles can be used throughout Launcher, e.g.
Widget Picker and Folders, but this CL only applies it to All Apps.

At a high level, views wishing to apply transparency to show blur
should use these new attr values rather than colors directly.

When blur changes, e.g. starting or stopping battery saver, the
style is re-applied and revelant views are invalidated. For
Launcher, this is handled by DepthController, and for Taskbar it's
handled by a CrossWindowBlurListener.

Also updated the Private Space animation slightly to account for
the translucent decorators (specifically, we can't use the mask
view to cover them when blur is enabled).

Screenshots: https://drive.google.com/drive/folders/1tU472KHotgEBpT-Ec9VOBWPBf_YdVqv2?resourcekey=0-ebf7W8O6iDJ4UVMtRzTABg&usp=sharing
Private Space animations: https://drive.google.com/file/d/1h5pn8Xb17TPcbujr7uSAJNTq8kwNZoIp/view?usp=drive_link&resourcekey=0-TzpaJ16Gg8_QJctBx4oiIg
Private Space QS Tile animations: https://drive.google.com/file/d/1dCuqnqd5z2kSBEakGobMlEkMwFDBWRbJ/view?usp=drive_link&resourcekey=0-qRVFPb-a6OzaZQOf4x86Jw

Bug: 371343636
Test: Manual
Flag: com.android.launcher3.all_apps_blur
Change-Id: Ia9f581f50d1adc0830569656bdeb751deb710a9c
This commit is contained in:
Andy Wickham committed 2025-04-15 16:42:56 -07:00
1 parent ef95172183
commit 16a024df71
37 files changed
+330 -166
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+78 -22
View File
@@ -66,6 +66,7 @@ import androidx.annotation.Px;
import androidx.annotation.VisibleForTesting;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.graphics.ColorUtils;
import androidx.core.util.Consumer;
import androidx.recyclerview.widget.RecyclerView;
import com.android.launcher3.DeviceProfile;
@@ -180,8 +181,9 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
private float[] mBottomSheetCornerRadii;
private ScrimView mScrimView;
private int mHeaderColor;
private int mBottomSheetBackgroundColor;
private float mBottomSheetBackgroundAlpha = 1f;
private int mBottomSheetBackgroundColorBlurFallback;
private int mBottomSheetBackgroundColorOverBlur;
private int mBottomSheetBackgroundColorLegacy;
private int mTabsProtectionAlpha;
@Nullable private AllAppsTransitionController mAllAppsTransitionController;
@@ -312,17 +314,22 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
0,
0 // Bottom left
};
if (Flags.allAppsBlur()) {
int resId = Utilities.isDarkTheme(getContext())
? android.R.color.system_accent1_800 : android.R.color.system_accent1_100;
int layerAbove = ColorUtils.setAlphaComponent(getResources().getColor(resId, null),
(int) (0.4f * 255));
int overBlurBaseColor = getContext().getColor(Utilities.isDarkTheme(getContext())
? android.R.color.system_accent1_800
: android.R.color.system_accent1_100);
int layerAbove = ColorUtils.setAlphaComponent(overBlurBaseColor, (int) (0.4f * 255));
int layerBelow = ColorUtils.setAlphaComponent(Color.WHITE, (int) (0.1f * 255));
mBottomSheetBackgroundColor = ColorUtils.compositeColors(layerAbove, layerBelow);
} else {
mBottomSheetBackgroundColor = getContext().getColor(R.color.materialColorSurfaceDim);
mBottomSheetBackgroundColorOverBlur = ColorUtils.compositeColors(layerAbove,
layerBelow);
mBottomSheetBackgroundColorBlurFallback = getContext().getColor(
Utilities.isDarkTheme(getContext()) ? android.R.color.system_accent1_800
: android.R.color.system_accent2_100);
}
mBottomSheetBackgroundAlpha = Color.alpha(mBottomSheetBackgroundColor) / 255.0f;
mBottomSheetBackgroundColorLegacy = getContext().getColor(R.color.materialColorSurfaceDim);
updateBackgroundVisibility(mActivityContext.getDeviceProfile());
mSearchUiManager.initializeSearch(this);
}
@@ -789,8 +796,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
}
protected void updateHeaderScroll(int scrolledOffset) {
float prog1 = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);
int headerColor = getHeaderColor(prog1);
float prog = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);
int headerColor = getHeaderColor(prog);
int tabsAlpha = mHeader.getPeripheralProtectionHeight(/* expectedHeight */ false) == 0 ? 0
: (int) (Utilities.boundToRange(
(scrolledOffset + mHeader.mSnappedScrolledY) / mHeaderThreshold, 0f, 1f)
@@ -804,7 +811,6 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
return;
}
float prog = Utilities.boundToRange((float) scrolledOffset / mHeaderThreshold, 0f, 1f);
boolean bgVisible = mSearchUiManager.getBackgroundVisibility();
if (scrolledOffset == 0 && !isSearching()) {
bgVisible = true;
@@ -815,9 +821,43 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
}
protected int getHeaderColor(float blendRatio) {
return ColorUtils.setAlphaComponent(
ColorUtils.blendARGB(mScrimColor, mHeaderProtectionColor, blendRatio),
(int) (mSearchContainer.getAlpha() * 255));
if (!mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()) {
return ColorUtils.setAlphaComponent(
ColorUtils.blendARGB(mScrimColor, mHeaderProtectionColor, blendRatio),
(int) (mSearchContainer.getAlpha() * 255));
}
return isBackgroundBlurEnabled()
? ColorUtils.setAlphaComponent(mHeaderProtectionColor, (int) (blendRatio * 255))
: ColorUtils.blendARGB(getBackgroundColor(), mHeaderProtectionColor, blendRatio);
}
private int getBackgroundColor() {
return mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()
? getBottomSheetBackgroundColor() : mScrimColor;
}
int getBottomSheetBackgroundColor() {
if (!Flags.allAppsBlur()) {
return mBottomSheetBackgroundColorLegacy;
}
if (!mActivityContext.isBackgroundBlurEnabled()) {
// Don't apply any alpha if the blur is disabled.
return mBottomSheetBackgroundColorBlurFallback;
}
return mBottomSheetBackgroundColorOverBlur;
}
boolean isBackgroundBlurEnabled() {
return Flags.allAppsBlur() && mActivityContext.isBackgroundBlurEnabled();
}
/** Refresh the UI according to the current theme. */
public void onThemeChanged() {
updateHeaderScroll(getActiveRecyclerView().computeVerticalScrollOffset());
invalidateHeader();
forAllRecyclerViews(RecyclerView::invalidateItemDecorations);
getSearchUiManager().onThemeChanged();
getFloatingHeaderView().getTabLayout().updateTheme();
}
/**
@@ -1099,6 +1139,16 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
return getActiveAppsRecyclerView();
}
/** Run some code on all the recycler views. */
protected void forAllRecyclerViews(Consumer<AllAppsRecyclerView> consumer) {
for (AdapterHolder holder : mAH) {
if (holder.mRecyclerView == null) {
continue;
}
consumer.accept(holder.mRecyclerView);
}
}
/** The current focus change listener in the search container. */
public OnFocusChangeListener getSearchFocusChangeListener() {
return mAH.get(AdapterHolder.SEARCH).mOnFocusChangeListener;
@@ -1413,9 +1463,11 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
final float rightWithScale = panel.getRight() - horizontalScaleOffset;
final float bottomWithOffset = panel.getBottom() + bottomOffsetPx;
// Draw full background panel for tablets.
int bottomSheetBackgroundColor = getBottomSheetBackgroundColor();
float bottomSheetBackgroundAlpha = Color.alpha(bottomSheetBackgroundColor) / 255.0f;
if (hasBottomSheet) {
mHeaderPaint.setColor(mBottomSheetBackgroundColor);
mHeaderPaint.setAlpha((int) (mBottomSheetBackgroundAlpha * 255));
mHeaderPaint.setColor(bottomSheetBackgroundColor);
mHeaderPaint.setAlpha((int) (bottomSheetBackgroundAlpha * 255));
mTmpRectF.set(
leftWithScale,
@@ -1427,7 +1479,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
canvas.drawPath(mTmpPath, mHeaderPaint);
// When the background panel is blurred, we don't add header protection.
if (Flags.allAppsBlur()) {
if (isBackgroundBlurEnabled()) {
return;
}
}
@@ -1439,12 +1491,16 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
mHeaderPaint.setColor(mHeaderColor);
mHeaderPaint.setAlpha((int) (getAlpha() * Color.alpha(mHeaderColor)));
}
if (mHeaderPaint.getColor() == mScrimColor || mHeaderPaint.getColor() == 0) {
// If header is not visible or only differs from the background with alpha, don't draw it.
int headerWithoutAlpha = ColorUtils.setAlphaComponent(mHeaderPaint.getColor(), 0);
int backgroundWithoutAlpha = ColorUtils.setAlphaComponent(getBackgroundColor(), 0);
if (headerWithoutAlpha == backgroundWithoutAlpha || mHeaderPaint.getColor() == 0) {
return;
}
if (hasBottomSheet) {
mHeaderPaint.setAlpha((int) (mHeaderPaint.getAlpha() * mBottomSheetBackgroundAlpha));
mHeaderPaint.setAlpha((int) (mHeaderPaint.getAlpha() * bottomSheetBackgroundAlpha));
}
// Draw header on background panel
@@ -1480,7 +1536,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
} else {
float tabAlpha = getAlpha() * mTabsProtectionAlpha;
if (hasBottomSheet) {
tabAlpha *= mBottomSheetBackgroundAlpha;
tabAlpha *= bottomSheetBackgroundAlpha;
}
mHeaderPaint.setAlpha((int) tabAlpha);
}