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

Merge "Update blur style for more things." into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-04-28 13:51:25 -07:00
committed by Android (Google) Code Review
parent 075869da85 6610425a1d
commit 3bde3a8331
7 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/res/values/styles.xml
+6
View File
@@ -383,20 +383,26 @@
<style name="BlurStyle">
<item name="allAppsScrimColor">@androidprv:color/shade_panel_scrim_color</item>
<item name="groupHighlight">@androidprv:color/surface_effect_1</item>
<item name="focusHighlight">@androidprv:color/surface_effect_2</item>
<item name="allAppsSurfaceLow">@androidprv:color/surface_effect_0</item>
<item name="allAppsSurfaceHighest">@androidprv:color/surface_effect_2</item>
<item name="allAppsUnselectedTab">@androidprv:color/surface_effect_1</item>
<item name="allappsHeaderProtectionColor">@androidprv:color/surface_effect_0</item>
<item name="privateSpaceSettingsColor">@androidprv:color/surface_effect_2</item>
<item name="privateSpaceDividerColor">@androidprv:color/surface_effect_3</item>
<item name="bottomSheetDragHandleColor">@androidprv:color/surface_effect_1</item>
</style>
<style name="BlurFallbackStyle">
<item name="allAppsScrimColor">@color/widgets_picker_scrim</item>
<item name="groupHighlight">@color/materialColorSurfaceContainerHigh</item>
<item name="focusHighlight">@color/materialColorSurfaceBright</item>
<item name="allAppsSurfaceLow">@color/materialColorSurfaceContainerLow</item>
<item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
<item name="allAppsUnselectedTab">@color/materialColorSurfaceBright</item>
<item name="allappsHeaderProtectionColor">@color/materialColorPrimaryContainer</item>
<item name="privateSpaceSettingsColor">@color/materialColorSurfaceBright</item>
<item name="privateSpaceDividerColor">@color/materialColorOutlineVariant</item>
<item name="bottomSheetDragHandleColor">@color/materialColorOutlineVariant</item>
</style>
</resources>
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+1
View File
@@ -462,6 +462,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
return;
}
getTheme().applyStyle(getBlurStyleResId(), true);
getAppsView().getContext().getTheme().applyStyle(getBlurStyleResId(), true);
getAppsView().onThemeChanged();
}
res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
+1 -1
View File
@@ -16,6 +16,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<solid android:color="@color/materialColorOutlineVariant"/>
<solid android:color="?attr/bottomSheetDragHandleColor"/>
<corners android:radius="@dimen/bottom_sheet_handle_corner_radius" />
</shape>
res/drawable/private_space_app_divider.xml
+1 -1
View File
@@ -16,6 +16,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/materialColorOutlineVariant"/>
<solid android:color="?attr/privateSpaceDividerColor"/>
<size android:height="@dimen/all_apps_divider_height" />
</shape>
res/values/attrs.xml
+2
View File
@@ -26,6 +26,8 @@
<attr name="allAppsUnselectedTab" format="color" />
<attr name="allAppsSearchIconBackground" format="color" />
<attr name="privateSpaceSettingsColor" format="color" />
<attr name="privateSpaceDividerColor" format="color" />
<attr name="bottomSheetDragHandleColor" format="color" />
<attr name="allAppsTheme" format="reference" />
<attr name="popupColorPrimary" format="color" />
<attr name="popupColorSecondary" format="color" />
res/values/styles.xml
+2
View File
@@ -47,6 +47,8 @@
<item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
<item name="allAppsUnselectedTab">@color/materialColorSurfaceBright</item>
<item name="privateSpaceSettingsColor">@color/materialColorSurfaceBright</item>
<item name="privateSpaceDividerColor">@color/materialColorOutlineVariant</item>
<item name="bottomSheetDragHandleColor">@color/materialColorOutlineVariant</item>
<item name="popupColorPrimary">@color/popup_color_primary_light</item>
<item name="popupColorSecondary">@color/popup_color_secondary_light</item>
<item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+4
View File
@@ -176,6 +176,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
private SearchRecyclerView mSearchRecyclerView;
protected SearchAdapterProvider<?> mMainAdapterProvider;
private View mBottomSheetHandleArea;
private View mBottomSheetHandle;
private boolean mHasWorkApps;
private boolean mHasPrivateApps;
private float[] mBottomSheetCornerRadii;
@@ -273,6 +274,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
mAdditionalHeaderRows.addAll(getAdditionalHeaderRows());
mBottomSheetBackground = findViewById(R.id.bottom_sheet_background);
mBottomSheetHandleArea = findViewById(R.id.bottom_sheet_handle_area);
mBottomSheetHandle = findViewById(R.id.bottom_sheet_handle);
mSearchRecyclerView = findViewById(R.id.search_results_list_view);
mFastScroller = findViewById(R.id.fast_scroller);
mFastScroller.setPopupView(findViewById(R.id.fast_scroller_popup));
@@ -861,6 +863,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
forAllRecyclerViews(RecyclerView::invalidateItemDecorations);
getSearchUiManager().onThemeChanged();
getFloatingHeaderView().getTabLayout().updateTheme();
mBottomSheetHandle.setBackground(getContext().getDrawable(
R.drawable.bg_rounded_corner_bottom_sheet_handle));
}
/**