From f38d98d1a678cbf4481a7411bd2f4a452b4a3604 Mon Sep 17 00:00:00 2001 From: Marcelo Arteiro Date: Mon, 1 Jul 2024 18:18:08 +0000 Subject: [PATCH] Align color resources in launcher projects. This is an effort to align/unify color usage across all launcher projects and the system itself. This fix recreates all dynamic color attributes present in the OS since many launcher areas cannot access private attributes. It is recomemnded to use these new local attributes in all launcher areas and avoid creating new color resources when these can be used directly. Bug: 352690172 Test: Presubmits Flag: EXEMPT bugfix Change-Id: Ic36b8bf70ee37f2fdd32e459e66f0e2d001d6ba2 --- go/quickstep/res/values/styles.xml | 2 +- quickstep/res/color/all_set_bg_primary.xml | 2 +- quickstep/res/color/all_set_bg_tertiary.xml | 2 +- .../color/bubblebar_drop_target_bg_color.xml | 2 +- .../res/color/menu_item_hover_state_color.xml | 4 +- .../drawable/bg_bubble_bar_drop_target.xml | 2 +- .../bg_bubble_expanded_view_drop_target.xml | 2 +- .../drawable/bg_floating_desktop_select.xml | 2 +- .../drawable/bg_overview_clear_all_button.xml | 2 +- .../res/drawable/bg_taskbar_edu_tooltip.xml | 2 +- quickstep/res/drawable/bg_wellbeing_toast.xml | 2 +- quickstep/res/drawable/ic_chevron_down.xml | 2 +- ...uick_switch_overview_button_background.xml | 2 +- .../res/drawable/rotate_tutorial_warning.xml | 2 +- .../keyboard_quick_switch_taskview.xml | 2 +- .../gesture_tutorial_step_menu.xml | 4 +- .../res/layout/digital_wellbeing_toast.xml | 2 +- .../res/layout/gesture_tutorial_step_menu.xml | 4 +- quickstep/res/layout/icon_app_chip_view.xml | 2 +- .../layout/keyboard_quick_switch_taskview.xml | 2 +- ...eyboard_quick_switch_textonly_taskview.xml | 4 +- .../res/layout/keyboard_quick_switch_view.xml | 2 +- .../res/layout/overview_clear_all_button.xml | 4 +- quickstep/res/layout/task.xml | 4 +- quickstep/res/layout/task_desktop.xml | 4 +- quickstep/res/layout/task_grouped.xml | 4 +- .../res/layout/task_view_menu_option.xml | 4 +- quickstep/res/values-night/colors.xml | 4 +- quickstep/res/values-night/styles.xml | 20 +-- quickstep/res/values/colors.xml | 4 +- quickstep/res/values/styles.xml | 30 ++-- .../appprediction/AppsDividerView.java | 7 +- .../launcher3/taskbar/TaskbarEduTooltip.kt | 3 +- .../taskbar/bubbles/BubbleBarController.java | 4 +- .../material_color_surface.xml | 19 --- .../material_color_surface_bright.xml | 19 --- .../material_color_surface_container.xml | 19 --- .../material_color_surface_container_high.xml | 19 --- ...terial_color_surface_container_highest.xml | 19 --- .../material_color_surface_container_low.xml | 19 --- ...aterial_color_surface_container_lowest.xml | 19 --- .../material_color_surface_dim.xml | 19 --- .../material_color_surface_inverse.xml | 19 --- .../material_color_surface_variant.xml | 19 --- res/color-night-v31/popup_shade_first.xml | 5 +- res/color-v31/material_color_surface.xml | 19 --- .../material_color_surface_bright.xml | 19 --- .../material_color_surface_container.xml | 19 --- .../material_color_surface_container_high.xml | 19 --- ...terial_color_surface_container_highest.xml | 19 --- .../material_color_surface_container_low.xml | 19 --- ...aterial_color_surface_container_lowest.xml | 19 --- res/color-v31/material_color_surface_dim.xml | 19 --- .../material_color_surface_inverse.xml | 20 --- .../material_color_surface_variant.xml | 19 --- res/color-v31/popup_shade_first.xml | 5 +- res/color/overview_button.xml | 7 +- res/color/popup_shade_first.xml | 5 +- res/drawable/add_item_dialog_background.xml | 2 +- res/drawable/all_apps_tabs_background.xml | 4 +- .../bg_rounded_corner_bottom_sheet_handle.xml | 3 +- .../button_top_rounded_bordered_ripple.xml | 2 +- res/drawable/ic_close_work_edu.xml | 2 +- .../ic_private_space_with_background.xml | 3 +- res/drawable/icon_menu_arrow_background.xml | 5 +- .../private_space_install_app_icon.xml | 4 +- res/drawable/rounded_action_button.xml | 7 +- res/drawable/work_card.xml | 2 +- res/layout/private_space_header.xml | 4 +- res/values-night-v31/colors.xml | 35 ---- res/values-night/colors.xml | 64 ------- res/values-night/styles.xml | 49 ++++++ res/values-v30/styles.xml | 1 + res/values-v31/colors.xml | 35 ---- res/values-v34/colors.xml | 101 +++++++++++ res/values/attrs.xml | 94 ++++++----- res/values/colors.xml | 159 ++++++++++++------ res/values/styles.xml | 117 ++++++------- .../allapps/SectionDecorationHandler.java | 9 +- .../util/ActivityContextWrapper.java | 8 +- .../allapps/PrivateSpaceHeaderViewTest.java | 3 +- 81 files changed, 477 insertions(+), 783 deletions(-) delete mode 100644 res/color-night-v31/material_color_surface.xml delete mode 100644 res/color-night-v31/material_color_surface_bright.xml delete mode 100644 res/color-night-v31/material_color_surface_container.xml delete mode 100644 res/color-night-v31/material_color_surface_container_high.xml delete mode 100644 res/color-night-v31/material_color_surface_container_highest.xml delete mode 100644 res/color-night-v31/material_color_surface_container_low.xml delete mode 100644 res/color-night-v31/material_color_surface_container_lowest.xml delete mode 100644 res/color-night-v31/material_color_surface_dim.xml delete mode 100644 res/color-night-v31/material_color_surface_inverse.xml delete mode 100644 res/color-night-v31/material_color_surface_variant.xml delete mode 100644 res/color-v31/material_color_surface.xml delete mode 100644 res/color-v31/material_color_surface_bright.xml delete mode 100644 res/color-v31/material_color_surface_container.xml delete mode 100644 res/color-v31/material_color_surface_container_high.xml delete mode 100644 res/color-v31/material_color_surface_container_highest.xml delete mode 100644 res/color-v31/material_color_surface_container_low.xml delete mode 100644 res/color-v31/material_color_surface_container_lowest.xml delete mode 100644 res/color-v31/material_color_surface_dim.xml delete mode 100644 res/color-v31/material_color_surface_inverse.xml delete mode 100644 res/color-v31/material_color_surface_variant.xml delete mode 100644 res/values-night/colors.xml diff --git a/go/quickstep/res/values/styles.xml b/go/quickstep/res/values/styles.xml index c659331bde..2524c760f4 100644 --- a/go/quickstep/res/values/styles.xml +++ b/go/quickstep/res/values/styles.xml @@ -16,7 +16,7 @@ --> - \ No newline at end of file diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 0f997f9b77..0bb971e166 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -95,6 +95,6 @@ ?androidprv:attr/colorAccentPrimaryVariant - ?androidprv:attr/materialColorPrimaryFixedDim - ?androidprv:attr/materialColorOnPrimaryFixed + ?attr/materialColorPrimaryFixedDim + ?attr/materialColorOnPrimaryFixed \ No newline at end of file diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 153bc99e90..1f4720c255 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -124,7 +124,7 @@ diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java index 84c2ed252b..7a8b58e58f 100644 --- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java +++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java @@ -31,12 +31,12 @@ import android.view.View; import android.view.accessibility.AccessibilityManager; import androidx.annotation.ColorInt; -import androidx.core.content.ContextCompat; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.allapps.FloatingHeaderRow; import com.android.launcher3.allapps.FloatingHeaderView; +import com.android.launcher3.util.Themes; /** * A view which shows a horizontal divider @@ -84,10 +84,9 @@ public class AppsDividerView extends View implements FloatingHeaderRow { getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height) }; - mStrokeColor = ContextCompat.getColor(context, R.color.material_color_outline_variant); + mStrokeColor = Themes.getAttrColor(context, R.attr.materialColorOutlineVariant); - mAllAppsLabelTextColor = ContextCompat.getColor(context, - R.color.material_color_on_surface_variant); + mAllAppsLabelTextColor = Themes.getAttrColor(context, R.attr.materialColorOnSurfaceVariant); mAccessibilityManager = AccessibilityManager.getInstance(context); setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(context)); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt index 7f9d8a390e..19e987234f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt @@ -53,8 +53,7 @@ constructor( private val activityContext: ActivityContext = ActivityContext.lookupContext(context) - private val backgroundColor = - Themes.getAttrColor(context, com.android.internal.R.attr.materialColorSurfaceBright) + private val backgroundColor = Themes.getAttrColor(context, R.attr.materialColorSurfaceBright) private val tooltipCornerRadius = Themes.getDialogCornerRadius(context) private val arrowWidth = resources.getDimension(R.dimen.popup_arrow_width) diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java index 83d4df29c8..5be01718e6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java @@ -635,8 +635,8 @@ public class BubbleBarController extends IBubblesListener.Stub { final TypedArray ta = mContext.obtainStyledAttributes( new int[]{ - com.android.internal.R.attr.materialColorOnPrimaryFixed, - com.android.internal.R.attr.materialColorPrimaryFixed + R.attr.materialColorOnPrimaryFixed, + R.attr.materialColorPrimaryFixed }); int overflowIconColor = ta.getColor(0, Color.WHITE); int overflowBackgroundColor = ta.getColor(1, Color.BLACK); diff --git a/res/color-night-v31/material_color_surface.xml b/res/color-night-v31/material_color_surface.xml deleted file mode 100644 index a645f24dd9..0000000000 --- a/res/color-night-v31/material_color_surface.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_bright.xml b/res/color-night-v31/material_color_surface_bright.xml deleted file mode 100644 index f34ed6c548..0000000000 --- a/res/color-night-v31/material_color_surface_bright.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container.xml b/res/color-night-v31/material_color_surface_container.xml deleted file mode 100644 index 002b88eba4..0000000000 --- a/res/color-night-v31/material_color_surface_container.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_high.xml b/res/color-night-v31/material_color_surface_container_high.xml deleted file mode 100644 index edd36fcd23..0000000000 --- a/res/color-night-v31/material_color_surface_container_high.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_highest.xml b/res/color-night-v31/material_color_surface_container_highest.xml deleted file mode 100644 index e54f95380e..0000000000 --- a/res/color-night-v31/material_color_surface_container_highest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_low.xml b/res/color-night-v31/material_color_surface_container_low.xml deleted file mode 100644 index 40f0d4c9de..0000000000 --- a/res/color-night-v31/material_color_surface_container_low.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_container_lowest.xml b/res/color-night-v31/material_color_surface_container_lowest.xml deleted file mode 100644 index 24f559b494..0000000000 --- a/res/color-night-v31/material_color_surface_container_lowest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_dim.xml b/res/color-night-v31/material_color_surface_dim.xml deleted file mode 100644 index a645f24dd9..0000000000 --- a/res/color-night-v31/material_color_surface_dim.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_inverse.xml b/res/color-night-v31/material_color_surface_inverse.xml deleted file mode 100644 index ac63072a9e..0000000000 --- a/res/color-night-v31/material_color_surface_inverse.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/material_color_surface_variant.xml b/res/color-night-v31/material_color_surface_variant.xml deleted file mode 100644 index a645f24dd9..0000000000 --- a/res/color-night-v31/material_color_surface_variant.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-night-v31/popup_shade_first.xml b/res/color-night-v31/popup_shade_first.xml index 83822a62bc..28995e32bd 100644 --- a/res/color-night-v31/popup_shade_first.xml +++ b/res/color-night-v31/popup_shade_first.xml @@ -12,7 +12,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + diff --git a/res/color-v31/material_color_surface.xml b/res/color-v31/material_color_surface.xml deleted file mode 100644 index b049851ff4..0000000000 --- a/res/color-v31/material_color_surface.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_bright.xml b/res/color-v31/material_color_surface_bright.xml deleted file mode 100644 index b049851ff4..0000000000 --- a/res/color-v31/material_color_surface_bright.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container.xml b/res/color-v31/material_color_surface_container.xml deleted file mode 100644 index b031c081a9..0000000000 --- a/res/color-v31/material_color_surface_container.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_high.xml b/res/color-v31/material_color_surface_container_high.xml deleted file mode 100644 index a996d51eba..0000000000 --- a/res/color-v31/material_color_surface_container_high.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_highest.xml b/res/color-v31/material_color_surface_container_highest.xml deleted file mode 100644 index e7a535af53..0000000000 --- a/res/color-v31/material_color_surface_container_highest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_low.xml b/res/color-v31/material_color_surface_container_low.xml deleted file mode 100644 index b8fe01e484..0000000000 --- a/res/color-v31/material_color_surface_container_low.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_container_lowest.xml b/res/color-v31/material_color_surface_container_lowest.xml deleted file mode 100644 index 25e8666862..0000000000 --- a/res/color-v31/material_color_surface_container_lowest.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_dim.xml b/res/color-v31/material_color_surface_dim.xml deleted file mode 100644 index e2d226fa89..0000000000 --- a/res/color-v31/material_color_surface_dim.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_inverse.xml b/res/color-v31/material_color_surface_inverse.xml deleted file mode 100644 index e189862856..0000000000 --- a/res/color-v31/material_color_surface_inverse.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/color-v31/material_color_surface_variant.xml b/res/color-v31/material_color_surface_variant.xml deleted file mode 100644 index e2d226fa89..0000000000 --- a/res/color-v31/material_color_surface_variant.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/color-v31/popup_shade_first.xml b/res/color-v31/popup_shade_first.xml index 1278bb494a..be73698c2e 100644 --- a/res/color-v31/popup_shade_first.xml +++ b/res/color-v31/popup_shade_first.xml @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml index 1dd8da60c7..0b317bd395 100644 --- a/res/color/overview_button.xml +++ b/res/color/overview_button.xml @@ -1,12 +1,11 @@ - + \ No newline at end of file diff --git a/res/color/popup_shade_first.xml b/res/color/popup_shade_first.xml index 1278bb494a..be73698c2e 100644 --- a/res/color/popup_shade_first.xml +++ b/res/color/popup_shade_first.xml @@ -13,7 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + + diff --git a/res/drawable/add_item_dialog_background.xml b/res/drawable/add_item_dialog_background.xml index e279fa051a..be4765a45b 100644 --- a/res/drawable/add_item_dialog_background.xml +++ b/res/drawable/add_item_dialog_background.xml @@ -1,7 +1,7 @@ - + diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml index 1e7cff2e93..62927afeb7 100644 --- a/res/drawable/all_apps_tabs_background.xml +++ b/res/drawable/all_apps_tabs_background.xml @@ -30,7 +30,7 @@ android:state_selected="false"> - + @@ -39,7 +39,7 @@ android:state_selected="true"> - + diff --git a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml index 379e0e53d6..a19465dba1 100644 --- a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml +++ b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml @@ -15,8 +15,7 @@ --> - + diff --git a/res/drawable/button_top_rounded_bordered_ripple.xml b/res/drawable/button_top_rounded_bordered_ripple.xml index f5b68866cb..13959f6925 100644 --- a/res/drawable/button_top_rounded_bordered_ripple.xml +++ b/res/drawable/button_top_rounded_bordered_ripple.xml @@ -25,7 +25,7 @@ android:topRightRadius="12dp" android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" /> - + diff --git a/res/drawable/ic_close_work_edu.xml b/res/drawable/ic_close_work_edu.xml index f336eea897..e4053e3ba7 100644 --- a/res/drawable/ic_close_work_edu.xml +++ b/res/drawable/ic_close_work_edu.xml @@ -20,6 +20,6 @@ android:viewportWidth="960" android:viewportHeight="960"> diff --git a/res/drawable/ic_private_space_with_background.xml b/res/drawable/ic_private_space_with_background.xml index cb37c9add5..cc73f6dafe 100644 --- a/res/drawable/ic_private_space_with_background.xml +++ b/res/drawable/ic_private_space_with_background.xml @@ -13,14 +13,13 @@ limitations under the License. --> + android:fillColor="?attr/materialColorSurfaceContainerLowest" /> + android:centerColor="?attr/materialColorSurfaceBright" + android:endColor="?attr/materialColorSurfaceBright" /> \ No newline at end of file diff --git a/res/drawable/private_space_install_app_icon.xml b/res/drawable/private_space_install_app_icon.xml index cfec2b126d..12c4a82f39 100644 --- a/res/drawable/private_space_install_app_icon.xml +++ b/res/drawable/private_space_install_app_icon.xml @@ -23,9 +23,9 @@ android:pathData="M30 0H30A30 30 0 0 1 60 30V30A30 30 0 0 1 30 60H30A30 30 0 0 1 0 30V30A30 30 0 0 1 30 0Z" /> + android:fillColor="?attr/materialColorSurfaceContainerLowest" /> + android:fillColor="?attr/materialColorOnSurface" /> diff --git a/res/drawable/rounded_action_button.xml b/res/drawable/rounded_action_button.xml index e283d3fee3..ddd3042cb9 100644 --- a/res/drawable/rounded_action_button.xml +++ b/res/drawable/rounded_action_button.xml @@ -7,7 +7,7 @@ ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ - ~ Unless required by applicable law or agreed to in writing, software + ~ Unless required by applicable law or agreed to in writing, soft]ware ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and @@ -16,13 +16,12 @@ - + + android:color="?attr/materialColorSurfaceContainerLow" /> diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml index 9bf2b8d0fc..01ec947158 100644 --- a/res/drawable/work_card.xml +++ b/res/drawable/work_card.xml @@ -17,7 +17,7 @@ - + diff --git a/res/layout/private_space_header.xml b/res/layout/private_space_header.xml index 52180cff77..e68f0f3d33 100644 --- a/res/layout/private_space_header.xml +++ b/res/layout/private_space_header.xml @@ -61,7 +61,7 @@ android:layout_marginBottom="@dimen/ps_lock_icon_margin_bottom" android:importantForAccessibility="no" android:src="@drawable/ic_lock" - app:tint="@color/material_color_primary_fixed_dim" + app:tint="?attr/materialColorPrimaryFixedDim" android:scaleType="center"/> @android:color/system_accent1_900 - - @android:color/system_accent2_700 - @android:color/system_accent3_700 - @android:color/system_accent1_700 - @android:color/system_accent2_100 - @android:color/system_accent3_100 - @android:color/system_accent1_100 - @android:color/system_accent2_200 - #FFDAD5 - @android:color/system_accent2_900 - @android:color/system_neutral1_900 - @android:color/system_accent3_200 - @android:color/system_accent3_900 - @android:color/system_accent1_200 - @android:color/system_accent2_700 - #930001 - @android:color/system_accent1_900 - @android:color/system_accent1_600 - @android:color/system_accent2_100 - @android:color/system_accent3_700 - @android:color/system_accent3_100 - @android:color/system_accent1_700 - @android:color/system_neutral1_800 - @android:color/system_accent1_100 - @android:color/system_accent2_800 - @android:color/system_accent3_800 - #690001 - @android:color/system_neutral2_200 - @android:color/system_neutral2_400 - @android:color/system_neutral2_700 - @android:color/system_accent1_800 - @android:color/system_neutral1_100 - @android:color/system_accent1_200 - @android:color/system_accent2_200 - @android:color/system_accent3_200 \ No newline at end of file diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml deleted file mode 100644 index 95b3a630ca..0000000000 --- a/res/values-night/colors.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - #3F4759 - #583E5B - #0D0E11 - #2B4678 - #DBE2F9 - #FBD7FC - #1B1B1F - #D8E2FF - #BFC6DC - #FFDAD5 - #141B2C - #1B1B1F - #DEBCDF - #29132D - #ADC6FF - #3F4759 - #930001 - #001A41 - #445E91 - #DBE2F9 - #FAF9FD - #44474F - #583E5B - #FBD7FC - #2B4678 - #E3E2E6 - #D8E2FF - #293041 - #402843 - #121316 - #38393C - #690001 - #121316 - #292A2D - #343538 - #C4C6D0 - #72747D - #444746 - #102F60 - #E3E2E6 - #1F1F23 - #ADC6FF - #BFC6DC - #DEBCDF - diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml index 9d50d07d53..06f0eee50f 100644 --- a/res/values-night/styles.xml +++ b/res/values-night/styles.xml @@ -26,7 +26,56 @@ true + + diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml index 727036680d..5c81d496f7 100644 --- a/res/values-v31/colors.xml +++ b/res/values-v31/colors.xml @@ -110,39 +110,4 @@ @android:color/system_accent1_900 @android:color/system_neutral1_1000 - - @android:color/system_accent2_700 - @android:color/system_accent3_700 - @android:color/system_accent1_700 - @android:color/system_accent2_900 - @android:color/system_accent3_900 - @android:color/system_accent1_900 - @android:color/system_accent2_200 - #410000 - @android:color/system_accent2_900 - @android:color/system_neutral1_100 - @android:color/system_accent3_200 - @android:color/system_accent3_900 - @android:color/system_accent1_200 - @android:color/system_accent2_100 - #FFDAD5 - @android:color/system_accent1_900 - @android:color/system_accent1_200 - @android:color/system_accent2_100 - @android:color/system_accent3_100 - @android:color/system_accent3_100 - @android:color/system_accent1_100 - @android:color/system_neutral1_50 - @android:color/system_accent1_100 - @android:color/system_accent2_0 - @android:color/system_accent3_0 - #FFFFFF - @android:color/system_neutral2_700 - @android:color/system_neutral2_500 - @android:color/system_neutral2_200 - @android:color/system_accent1_0 - @android:color/system_neutral1_900 - @android:color/system_accent1_600 - @android:color/system_accent2_600 - @android:color/system_accent3_600 diff --git a/res/values-v34/colors.xml b/res/values-v34/colors.xml index d19d4a6ffd..4f3a769a61 100644 --- a/res/values-v34/colors.xml +++ b/res/values-v34/colors.xml @@ -30,4 +30,105 @@ @android:color/system_on_surface_variant_light + + @android:color/system_primary_container_light + @android:color/system_on_primary_container_light + @android:color/system_primary_light + @android:color/system_on_primary_light + @android:color/system_secondary_container_light + @android:color/system_on_secondary_container_light + @android:color/system_secondary_light + @android:color/system_on_secondary_light + @android:color/system_tertiary_container_light + @android:color/system_on_tertiary_container_light + @android:color/system_tertiary_light + @android:color/system_on_tertiary_light + @android:color/system_background_light + @android:color/system_on_background_light + @android:color/system_surface_light + @android:color/system_on_surface_light + @android:color/system_surface_container_low_light + @android:color/system_surface_container_lowest_light + @android:color/system_surface_container_light + @android:color/system_surface_container_high_light + @android:color/system_surface_container_highest_light + @android:color/system_surface_bright_light + @android:color/system_surface_dim_light + @android:color/system_surface_variant_light + @android:color/system_on_surface_variant_light + @android:color/system_outline_light + @android:color/system_outline_variant_light + @android:color/system_error_light + @android:color/system_on_error_light + @android:color/system_error_container_light + @android:color/system_on_error_container_light + @android:color/system_control_activated_light + @android:color/system_control_normal_light + @android:color/system_control_highlight_light + @android:color/system_text_primary_inverse_light + @android:color/system_text_secondary_and_tertiary_inverse_light + @android:color/system_text_primary_inverse_disable_only_light + @android:color/system_text_secondary_and_tertiary_inverse_disabled_light + @android:color/system_text_hint_inverse_light + @android:color/system_palette_key_color_primary_light + @android:color/system_palette_key_color_secondary_light + @android:color/system_palette_key_color_tertiary_light + @android:color/system_palette_key_color_neutral_light + @android:color/system_palette_key_color_neutral_variant_light + @android:color/system_primary_container_dark + @android:color/system_on_primary_container_dark + @android:color/system_primary_dark + @android:color/system_on_primary_dark + @android:color/system_secondary_container_dark + @android:color/system_on_secondary_container_dark + @android:color/system_secondary_dark + @android:color/system_on_secondary_dark + @android:color/system_tertiary_container_dark + @android:color/system_on_tertiary_container_dark + @android:color/system_tertiary_dark + @android:color/system_on_tertiary_dark + @android:color/system_background_dark + @android:color/system_on_background_dark + @android:color/system_surface_dark + @android:color/system_on_surface_dark + @android:color/system_surface_container_low_dark + @android:color/system_surface_container_lowest_dark + @android:color/system_surface_container_dark + @android:color/system_surface_container_high_dark + @android:color/system_surface_container_highest_dark + @android:color/system_surface_bright_dark + @android:color/system_surface_dim_dark + @android:color/system_surface_variant_dark + @android:color/system_on_surface_variant_dark + @android:color/system_outline_dark + @android:color/system_outline_variant_dark + @android:color/system_error_dark + @android:color/system_on_error_dark + @android:color/system_error_container_dark + @android:color/system_on_error_container_dark + @android:color/system_control_activated_dark + @android:color/system_control_normal_dark + @android:color/system_control_highlight_dark + @android:color/system_text_primary_inverse_dark + @android:color/system_text_secondary_and_tertiary_inverse_dark + @android:color/system_text_primary_inverse_disable_only_dark + @android:color/system_text_secondary_and_tertiary_inverse_disabled_dark + @android:color/system_text_hint_inverse_dark + @android:color/system_palette_key_color_primary_dark + @android:color/system_palette_key_color_secondary_dark + @android:color/system_palette_key_color_tertiary_dark + @android:color/system_palette_key_color_neutral_dark + @android:color/system_palette_key_color_neutral_variant_dark + @android:color/system_primary_fixed + @android:color/system_primary_fixed_dim + @android:color/system_on_primary_fixed + @android:color/system_on_primary_fixed_variant + @android:color/system_secondary_fixed + @android:color/system_secondary_fixed_dim + @android:color/system_on_secondary_fixed + @android:color/system_on_secondary_fixed_variant + @android:color/system_tertiary_fixed + @android:color/system_tertiary_fixed_dim + @android:color/system_on_tertiary_fixed + @android:color/system_on_tertiary_fixed_variant diff --git a/res/values/attrs.xml b/res/values/attrs.xml index eda36474b6..6151b5fb93 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -45,6 +45,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,51 +631,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values/colors.xml b/res/values/colors.xml index 02f69f6e48..c82358b5da 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -17,8 +17,7 @@ ** limitations under the License. */ --> - + #FFC1C1C1 @@ -105,7 +104,7 @@ #FAF9F8 #1F1F1F #4C4D50 - @color/material_color_on_surface_variant + @color/system_on_surface_variant_light #1F1F1F #444746 #C2E7FF @@ -119,14 +118,14 @@ #C4C7C5 #0B57D0 #0B57D0 - @color/material_color_on_surface - @color/material_color_on_surface_variant + @color/system_on_surface_light + @color/system_on_surface_variant_light #1F2020 #393939 #E3E3E3 #CCCDCF - @color/material_color_on_surface_variant + @color/system_on_surface_variant_dark #E3E3E3 #C4C7C5 #004A77 @@ -140,51 +139,107 @@ #444746 #062E6F #FFFFFF - @color/material_color_on_surface - @color/material_color_on_surface_variant + @color/system_on_surface_dark + @color/system_on_surface_variant_dark - #3F4759 - #583E5B - #FFFFFF - #2B4678 - #141B2C - #29132D - #F5F3F7 - #001A41 - #BFC6DC - #410000 - #141B2C - #E3E2E6 - #DEBCDF - #29132D - #ADC6FF - #DBE2F9 - #FFDAD5 - #001A41 - #ADC6FF - #DBE2F9 - #121316 - #E1E2EC - #FBD7FC - #FBD7FC - #D8E2FF - #1B1B1F - #D8E2FF - #FFFFFF - #FFFFFF - #DBD9DD - #FAF9FD - #FFFFFF - #FAF9FD - #E9E7EC - #E3E2E6 - #44474F - #72747D - #C4C7C5 - #FFFFFF - #1B1B1F - #EFEDF1 - #445E91 - #575E71 - #715573 + #D9E2FF + #001945 + #475D92 + #FFFFFF + #DCE2F9 + #151B2C + #575E71 + #FFFFFF + #FDD7FA + #2A122C + #725572 + #FFFFFF + #FAF8FF + #1A1B20 + #FAF8FF + #1A1B20 + #F4F3FA + #FFFFFF + #EEEDF4 + #E8E7EF + #E2E2E9 + #FAF8FF + #DAD9E0 + #E1E2EC + #44464F + #757780 + #C5C6D0 + #BA1A1A + #FFFFFF + #FFDAD6 + #410002 + #D9E2FF + #44464F + #000000 + #E2E2E9 + #C5C6D0 + #E2E2E9 + #E2E2E9 + #E2E2E9 + #6076AC + #70778B + #8C6D8C + #76777D + #757780 + #2F4578 + #D9E2FF + #B0C6FF + #152E60 + #404659 + #DCE2F9 + #C0C6DC + #2A3042 + #593D59 + #FDD7FA + #E0BBDD + #412742 + #121318 + #E2E2E9 + #121318 + #E2E2E9 + #1A1B20 + #0C0E13 + #1E1F25 + #282A2F + #33343A + #38393F + #121318 + #44464F + #C5C6D0 + #8F9099 + #44464F + #FFB4AB + #690005 + #93000A + #FFDAD6 + #2F4578 + #C5C6D0 + #FFFFFF + #1A1B20 + #44464F + #1A1B20 + #1A1B20 + #1A1B20 + #6076AC + #70778B + #8C6D8C + #76777D + #757780 + #D9E2FF + #B0C6FF + #001945 + #2F4578 + #DCE2F9 + #C0C6DC + #151B2C + #404659 + #FDD7FA + #E0BBDD + #2A122C + #593D59 diff --git a/res/values/styles.xml b/res/values/styles.xml index 7b43a3bd2a..ee7ed2687f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -17,7 +17,7 @@ */ --> - + - + + + diff --git a/src/com/android/launcher3/allapps/SectionDecorationHandler.java b/src/com/android/launcher3/allapps/SectionDecorationHandler.java index ac9b146f12..eaeb8bbdd3 100644 --- a/src/com/android/launcher3/allapps/SectionDecorationHandler.java +++ b/src/com/android/launcher3/allapps/SectionDecorationHandler.java @@ -25,7 +25,6 @@ import android.graphics.drawable.InsetDrawable; import android.view.View; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import com.android.launcher3.R; import com.android.launcher3.util.Themes; @@ -61,10 +60,10 @@ public class SectionDecorationHandler { mContext = context; mFillAlpha = fillAlpha; - mFocusColor = ContextCompat.getColor(context, - R.color.material_color_surface_bright); // UX recommended - mFillColor = ContextCompat.getColor(context, - R.color.material_color_surface_container_high); // UX recommended + mFocusColor = Themes.getAttrColor(context, + R.attr.materialColorSurfaceBright); // UX recommended + mFillColor = Themes.getAttrColor(context, + R.attr.materialColorSurfaceContainerHigh); // UX recommended mIsTopLeftRound = isTopLeftRound; mIsTopRightRound = isTopRightRound; diff --git a/tests/multivalentTests/src/com/android/launcher3/util/ActivityContextWrapper.java b/tests/multivalentTests/src/com/android/launcher3/util/ActivityContextWrapper.java index 191d284939..4217d22790 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/ActivityContextWrapper.java +++ b/tests/multivalentTests/src/com/android/launcher3/util/ActivityContextWrapper.java @@ -15,6 +15,7 @@ */ package com.android.launcher3.util; +import android.R; import android.content.Context; import android.content.ContextWrapper; import android.view.ContextThemeWrapper; @@ -39,11 +40,16 @@ public class ActivityContextWrapper extends ContextThemeWrapper implements Activ private final MyDragLayer mMyDragLayer; public ActivityContextWrapper(Context base) { - super(base, android.R.style.Theme_DeviceDefault); + this(base, R.style.Theme_DeviceDefault); + } + + public ActivityContextWrapper(Context base, int theme) { + super(base, theme); mProfile = InvariantDeviceProfile.INSTANCE.get(base).getDeviceProfile(base).copy(base); mMyDragLayer = new MyDragLayer(this); } + @Override public BaseDragLayer getDragLayer() { return mMyDragLayer; diff --git a/tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java b/tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java index eac7f63fb9..de48432492 100644 --- a/tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java +++ b/tests/src/com/android/launcher3/allapps/PrivateSpaceHeaderViewTest.java @@ -116,7 +116,8 @@ public class PrivateSpaceHeaderViewTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = new ActivityContextWrapper(getApplicationContext()); + mContext = new ActivityContextWrapper(getApplicationContext(), + R.style.DynamicColorsBaseLauncherTheme); when(mAllApps.getContext()).thenReturn(mContext); when(mUserCache.getUserInfo(PRIVATE_HANDLE)).thenReturn(PRIVATE_ICON_INFO); when(mUserCache.getUserProfiles())