Merge cherrypicks of ['googleplex-android-review.googlesource.com/33356345'] into 25Q3-release.

Change-Id: I95078ef012d44524cd099ec0ac781f1ee5f5ffae
This commit is contained in:
Android Build Coastguard Worker committed 2025-05-02 15:15:35 -07:00
commit f1ca35e7cc
2 files changed
+12 -7

No files matched your search

@@ -268,11 +268,13 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla
@Override
protected int getScrimColor(Context context) {
if (mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()
&& !Flags.allAppsBlur()) {
return context.getResources().getColor(R.color.widgets_picker_scrim);
if (!mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()) {
// Always use an opaque scrim if there's no sheet.
return context.getResources().getColor(R.color.materialColorSurfaceDim);
}
return Themes.getAttrColor(context, R.attr.allAppsScrimColor);
return Flags.allAppsBlur() ? Themes.getAttrColor(context, R.attr.allAppsScrimColor)
: context.getResources().getColor(R.color.widgets_picker_scrim);
}
@Override
@@ -204,9 +204,12 @@ public class AllAppsState extends LauncherState {
@Override
public int getWorkspaceScrimColor(Launcher launcher) {
if (launcher.getDeviceProfile().shouldShowAllAppsOnSheet() && !Flags.allAppsBlur()) {
return launcher.getResources().getColor(R.color.widgets_picker_scrim);
if (!launcher.getDeviceProfile().shouldShowAllAppsOnSheet()) {
// Always use an opaque scrim if there's no sheet.
return launcher.getResources().getColor(R.color.materialColorSurfaceDim);
}
return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
return Flags.allAppsBlur() ? Themes.getAttrColor(launcher, R.attr.allAppsScrimColor)
: launcher.getResources().getColor(R.color.widgets_picker_scrim);
}
}