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

Merge "Update colors for edit state" into udc-dev am: 4b43200910

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

Change-Id: I861ec92013e17564ba09d0529f940501cafdbbe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Federico Baron
2023-05-18 21:15:12 +00:00
committed by Automerger Merge Worker
parent 90edc421ff 4b43200910
commit 1690776a1d
9 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/color/cell_layout_bg_color_active.xml → res/color/cell_layout_bg_color.xml
+3 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.3"
android:color="?android:attr/colorAccent"/>
</selector>
<item android:alpha="0.35"
android:color="?attr/workspaceSurfaceColor"/>
</selector>
res/color/cell_layout_bg_color_inactive.xml
-5
View File
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.25"
android:color="?android:attr/colorAccent"/>
</selector>
res/drawable-v28/bg_celllayout.xml
+3 -3
View File
@@ -23,15 +23,15 @@
<shape android:shape="rectangle" >
<stroke
android:width="@dimen/spring_loaded_panel_border"
android:color="?android:attr/colorAccent" />
<solid android:color="@color/cell_layout_bg_color_active"/>
android:color="?attr/workspaceAccentColor" />
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="?android:attr/dialogCornerRadius" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/cell_layout_bg_color_inactive"/>
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="?android:attr/dialogCornerRadius" />
</shape>
</item>
res/drawable/bg_celllayout.xml
+3 -3
View File
@@ -23,15 +23,15 @@
<shape android:shape="rectangle" >
<stroke
android:width="@dimen/spring_loaded_panel_border"
android:color="?android:attr/colorAccent" />
<solid android:color="@color/cell_layout_bg_color_active"/>
android:color="?attr/workspaceAccentColor" />
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="@dimen/bg_round_rect_radius" />
</shape>
</item>
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/cell_layout_bg_color_inactive"/>
<solid android:color="@color/cell_layout_bg_color"/>
<corners android:radius="@dimen/bg_round_rect_radius" />
</shape>
</item>
res/drawable/drop_target_frame_hover.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="?attr/workspaceAccentColor" />
<solid android:color="?attr/dropTargetHoverButtonColor" />
<corners android:radius="@dimen/drop_target_button_frame_radius" />
</shape>
res/values-v31/colors.xml
+6 -1
View File
@@ -61,7 +61,12 @@
<color name="home_settings_track_off_color">@android:color/system_neutral2_600</color>
<color name="workspace_accent_color_light">@android:color/system_accent1_100</color>
<color name="workspace_accent_color_dark">@android:color/system_accent2_600</color>
<color name="workspace_accent_color_dark">@android:color/system_accent1_900</color>
<color name="workspace_surface_color">@android:color/system_accent1_100</color>
<color name="drop_target_hover_text_color_light">@android:color/system_accent1_900</color>
<color name="drop_target_hover_text_color_dark">@android:color/system_accent1_100</color>
<color name="drop_target_hover_button_color_light">@android:color/system_accent1_100</color>
<color name="drop_target_hover_button_color_dark">@android:color/system_accent1_700</color>
<color name="preload_icon_accent_color_light">@android:color/system_accent1_600</color>
<color name="preload_icon_background_color_light">@android:color/system_accent2_200</color>
res/values/attrs.xml
+2
View File
@@ -53,7 +53,9 @@
<attr name="folderHintTextColor" format="color" />
<attr name="isFolderDarkText" format="boolean" />
<attr name="workspaceAccentColor" format="color" />
<attr name="workspaceSurfaceColor" format="color" />
<attr name="dropTargetHoverTextColor" format="color" />
<attr name="dropTargetHoverButtonColor" format="color" />
<attr name="preloadIconAccentColor" format="color" />
<attr name="preloadIconBackgroundColor" format="color" />
<attr name="widgetPickerTitleColor" format="color"/>
res/values/colors.xml
+7 -2
View File
@@ -82,8 +82,13 @@
<color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>
<color name="workspace_accent_color_light">#ff8df5e3</color>
<color name="workspace_accent_color_dark">#ff3d665f</color>
<color name="workspace_accent_color_light">#D3E3FD</color>
<color name="workspace_accent_color_dark">#041E49</color>
<color name="workspace_surface_color">#D3E3FD</color>
<color name="drop_target_hover_text_color_light">#041E49</color>
<color name="drop_target_hover_text_color_dark">#D3E3FD</color>
<color name="drop_target_hover_button_color_light">#D3E3FD</color>
<color name="drop_target_hover_button_color_dark">#0842A0</color>
<color name="all_apps_button_color">#40484B</color>
res/values/styles.xml
+7 -3
View File
@@ -63,7 +63,9 @@
<item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
<item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
<item name="workspaceAccentColor">@color/workspace_accent_color_light</item>
<item name="dropTargetHoverTextColor">@color/workspace_text_color_dark</item>
<item name="workspaceSurfaceColor">@color/workspace_surface_color</item>
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_light</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_light</item>
<item name="overviewScrimColor">@color/overview_scrim</item>
<item name="preloadIconAccentColor">@color/preload_icon_accent_color_light</item>
<item name="preloadIconBackgroundColor">@color/preload_icon_background_color_light</item>
@@ -92,7 +94,8 @@
<item name="isWorkspaceDarkText">true</item>
<item name="workspaceStatusBarScrim">@null</item>
<item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
<item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_dark</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_dark</item>
</style>
<style name="LauncherTheme.Dark" parent="@style/LauncherTheme">
@@ -142,7 +145,8 @@
<item name="isWorkspaceDarkText">true</item>
<item name="workspaceStatusBarScrim">@null</item>
<item name="workspaceAccentColor">@color/workspace_accent_color_dark</item>
<item name="dropTargetHoverTextColor">@color/workspace_text_color_light</item>
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_dark</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_dark</item>
</style>
<!-- A derivative project can extend these themes to customize the application theme without