diff --git a/lawnchair/res/values/dimens.xml b/lawnchair/res/values/dimens.xml index 69c6fb3732..ece4192fb3 100644 --- a/lawnchair/res/values/dimens.xml +++ b/lawnchair/res/values/dimens.xml @@ -61,6 +61,8 @@ 52dp 4dp + 64dp + 1.5dp 2dp diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index a570f5420c..b2311d22d7 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -106,6 +106,7 @@ import java.util.stream.Stream; import app.lawnchair.allapps.LawnchairAlphabeticalAppsList; import app.lawnchair.font.FontManager; +import app.lawnchair.preferences.PreferenceManager; import app.lawnchair.preferences2.PreferenceManager2; import app.lawnchair.theme.color.tokens.ColorTokens; import app.lawnchair.ui.StretchRecyclerViewContainer; @@ -206,6 +207,7 @@ public class ActivityAllAppsContainerView private int mTabsProtectionAlpha; private final PreferenceManager2 pref2; + private final PreferenceManager pref; @Nullable private AllAppsTransitionController mAllAppsTransitionController; @@ -223,6 +225,7 @@ public class ActivityAllAppsContainerView mActivityContext = ActivityContext.lookupContext(context); mAllAppsStore = new AllAppsStore<>(mActivityContext); pref2 = PreferenceManager2.getInstance(mActivityContext); + pref = PreferenceManager.getInstance(mActivityContext); mScrimColor = ColorTokens.AllAppsScrimColor.resolveColor(context); mHeaderThreshold = getResources().getDimensionPixelSize( R.dimen.dynamic_grid_cell_border_spacing); @@ -828,9 +831,10 @@ public class ActivityAllAppsContainerView } protected int getHeaderColor(float blendRatio) { + var opacity = pref.getDrawerOpacity().get(); return ColorUtils.setAlphaComponent( ColorUtils.blendARGB(mScrimColor, mHeaderProtectionColor, blendRatio), - (int) (mSearchContainer.getAlpha() * 255)); + Math.round(opacity * 255)); } /**