diff --git a/quickstep/res/color/all_set_bg_primary.xml b/quickstep/res/color/all_set_bg_primary.xml index 013de7a30c..ce4fb475a6 100644 --- a/quickstep/res/color/all_set_bg_primary.xml +++ b/quickstep/res/color/all_set_bg_primary.xml @@ -15,5 +15,5 @@ --> - + diff --git a/quickstep/res/color/all_set_bg_tertiary.xml b/quickstep/res/color/all_set_bg_tertiary.xml index b58d61c2be..de4bab19c7 100644 --- a/quickstep/res/color/all_set_bg_tertiary.xml +++ b/quickstep/res/color/all_set_bg_tertiary.xml @@ -15,5 +15,5 @@ --> - + diff --git a/quickstep/res/color/bubblebar_drop_target_bg_color.xml b/quickstep/res/color/bubblebar_drop_target_bg_color.xml index bae8c4e028..a91465f0c5 100644 --- a/quickstep/res/color/bubblebar_drop_target_bg_color.xml +++ b/quickstep/res/color/bubblebar_drop_target_bg_color.xml @@ -15,5 +15,5 @@ --> - + \ No newline at end of file diff --git a/quickstep/res/color/menu_item_hover_state_color.xml b/quickstep/res/color/menu_item_hover_state_color.xml index 3c687895c2..eb35769b44 100644 --- a/quickstep/res/color/menu_item_hover_state_color.xml +++ b/quickstep/res/color/menu_item_hover_state_color.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/quickstep/res/color/taskbar_minimized_app_indicator_color.xml b/quickstep/res/color/taskbar_minimized_app_indicator_color.xml index 1596fe19ab..2703787ff8 100644 --- a/quickstep/res/color/taskbar_minimized_app_indicator_color.xml +++ b/quickstep/res/color/taskbar_minimized_app_indicator_color.xml @@ -15,5 +15,5 @@ ~ limitations under the License. --> - + diff --git a/quickstep/res/color/taskbar_running_app_indicator_color.xml b/quickstep/res/color/taskbar_running_app_indicator_color.xml index 5dc9781175..7f2d12d757 100644 --- a/quickstep/res/color/taskbar_running_app_indicator_color.xml +++ b/quickstep/res/color/taskbar_running_app_indicator_color.xml @@ -15,5 +15,5 @@ ~ limitations under the License. --> - + diff --git a/quickstep/res/drawable/bg_bubble_bar_drop_target.xml b/quickstep/res/drawable/bg_bubble_bar_drop_target.xml index f597cb5cb0..bf86a7ff0d 100644 --- a/quickstep/res/drawable/bg_bubble_bar_drop_target.xml +++ b/quickstep/res/drawable/bg_bubble_bar_drop_target.xml @@ -20,5 +20,5 @@ + android:color="@color/materialColorPrimaryContainer" /> diff --git a/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml b/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml index 169e396524..8fb5587ec7 100644 --- a/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml +++ b/quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml @@ -22,6 +22,6 @@ + android:color="@color/materialColorPrimaryContainer" /> diff --git a/quickstep/res/drawable/bg_floating_desktop_select.xml b/quickstep/res/drawable/bg_floating_desktop_select.xml index 6481be40c8..a707aab403 100644 --- a/quickstep/res/drawable/bg_floating_desktop_select.xml +++ b/quickstep/res/drawable/bg_floating_desktop_select.xml @@ -19,5 +19,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/quickstep/res/drawable/bg_overview_clear_all_button.xml b/quickstep/res/drawable/bg_overview_clear_all_button.xml index 0d1227442f..7f58cf8c4f 100644 --- a/quickstep/res/drawable/bg_overview_clear_all_button.xml +++ b/quickstep/res/drawable/bg_overview_clear_all_button.xml @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/quickstep/res/drawable/bg_taskbar_edu_tooltip.xml b/quickstep/res/drawable/bg_taskbar_edu_tooltip.xml index 9e9bb2bf54..e2fe4c001a 100644 --- a/quickstep/res/drawable/bg_taskbar_edu_tooltip.xml +++ b/quickstep/res/drawable/bg_taskbar_edu_tooltip.xml @@ -18,5 +18,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/quickstep/res/drawable/bg_wellbeing_toast.xml b/quickstep/res/drawable/bg_wellbeing_toast.xml index 418caae537..bb45bb3532 100644 --- a/quickstep/res/drawable/bg_wellbeing_toast.xml +++ b/quickstep/res/drawable/bg_wellbeing_toast.xml @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/quickstep/res/drawable/ic_chevron_down.xml b/quickstep/res/drawable/ic_chevron_down.xml index b586e5003e..15f7fc8c9a 100644 --- a/quickstep/res/drawable/ic_chevron_down.xml +++ b/quickstep/res/drawable/ic_chevron_down.xml @@ -19,7 +19,7 @@ android:width="48dp" android:height="48dp" android:autoMirrored="true" - android:tint="?attr/materialColorOnSurface" + android:tint="@color/materialColorOnSurface" android:viewportHeight="48" android:viewportWidth="48"> diff --git a/quickstep/res/layout-land/keyboard_quick_switch_taskview.xml b/quickstep/res/layout-land/keyboard_quick_switch_taskview.xml index d1e56675b8..b44510d47c 100644 --- a/quickstep/res/layout-land/keyboard_quick_switch_taskview.xml +++ b/quickstep/res/layout-land/keyboard_quick_switch_taskview.xml @@ -23,7 +23,7 @@ android:importantForAccessibility="yes" android:background="@drawable/keyboard_quick_switch_task_view_background" android:clipToOutline="true" - launcher:focusBorderColor="?attr/materialColorOutline"> + launcher:focusBorderColor="@color/materialColorOutline"> + launcher:focusBorderColor="@androidprv:color/materialColorOutline"> + android:background="@color/materialColorSurfaceBright"> - ?attr/materialColorPrimary + @color/materialColorPrimary \ No newline at end of file diff --git a/quickstep/res/values-night/styles.xml b/quickstep/res/values-night/styles.xml index eb8831068a..0a5e0afd7b 100644 --- a/quickstep/res/values-night/styles.xml +++ b/quickstep/res/values-night/styles.xml @@ -73,16 +73,16 @@ \ No newline at end of file diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 668bce764c..42c0478b9f 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + #fff #39000000 @@ -93,5 +93,5 @@ #f9ab00 - ?attr/materialColorPrimary + @color/materialColorPrimary \ No newline at end of file diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 6ffcb9b687..5f2a63dc4f 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -124,7 +124,7 @@ @@ -278,7 +278,7 @@ diff --git a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java index 32fda48332..e1e3eec790 100644 --- a/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java +++ b/quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java @@ -37,7 +37,6 @@ 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 @@ -85,9 +84,9 @@ public class AppsDividerView extends View implements FloatingHeaderRow { getResources().getDimensionPixelSize(R.dimen.all_apps_divider_height) }; - mStrokeColor = Themes.getAttrColor(context, R.attr.materialColorOutlineVariant); + mStrokeColor = context.getColor(R.color.materialColorOutlineVariant); - mAllAppsLabelTextColor = Themes.getAttrColor(context, R.attr.materialColorOnSurfaceVariant); + mAllAppsLabelTextColor = context.getColor(R.color.materialColorOnSurfaceVariant); mAccessibilityManager = AccessibilityManager.getInstance(context); setShowAllAppsLabel(!ALL_APPS_VISITED_COUNT.hasReachedMax(context)); diff --git a/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt b/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt index c0c2a024b2..bd3357d2b0 100644 --- a/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt +++ b/quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt @@ -148,7 +148,7 @@ class ManageWindowsTaskbarShortcut( ) : ManageWindowsViewContainer( originalView.context, - Themes.getAttrColor(originalView.context, R.attr.materialColorSurfaceBright), + originalView.context.getColor(R.color.materialColorSurfaceBright), ), TouchController { private val taskbarActivityContext = controllers.taskbarActivityContext diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt index 19e987234f..d85dd50bb3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt @@ -45,15 +45,12 @@ private const val EXIT_DURATION_MS = 150L /** Floating tooltip for Taskbar education. */ class TaskbarEduTooltip @JvmOverloads -constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0, -) : AbstractFloatingView(context, attrs, defStyleAttr) { +constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : + AbstractFloatingView(context, attrs, defStyleAttr) { private val activityContext: ActivityContext = ActivityContext.lookupContext(context) - private val backgroundColor = Themes.getAttrColor(context, R.attr.materialColorSurfaceBright) + private val backgroundColor = context.getColor(R.color.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/BubbleCreator.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java index c5efe2fca3..8b344cfd5f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java @@ -30,7 +30,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.LauncherApps; import android.content.pm.PackageManager; import android.content.pm.ShortcutInfo; -import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.Matrix; @@ -217,14 +216,8 @@ public class BubbleCreator { private Bitmap createOverflowBitmap() { Drawable iconDrawable = mContext.getDrawable(R.drawable.bubble_ic_overflow_button); - final TypedArray ta = mContext.obtainStyledAttributes( - new int[]{ - R.attr.materialColorOnPrimaryFixed, - R.attr.materialColorPrimaryFixed - }); - int overflowIconColor = ta.getColor(0, Color.WHITE); - int overflowBackgroundColor = ta.getColor(1, Color.BLACK); - ta.recycle(); + int overflowIconColor = mContext.getColor(R.color.materialColorOnPrimaryFixed); + int overflowBackgroundColor = mContext.getColor(R.color.materialColorPrimaryFixed); iconDrawable.setTint(overflowIconColor); diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt index f9f5a151a9..216f5e3701 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt @@ -402,18 +402,13 @@ class BubbleBarFlyoutView( val isNightModeOn = nightModeFlags == Configuration.UI_MODE_NIGHT_YES val defaultBackgroundColor = if (isNightModeOn) Color.BLACK else Color.WHITE val defaultTextColor = if (isNightModeOn) Color.WHITE else Color.BLACK - val ta = - context.obtainStyledAttributes( - intArrayOf( - com.android.internal.R.attr.materialColorSurfaceContainer, - com.android.internal.R.attr.materialColorOnSurface, - com.android.internal.R.attr.materialColorOnSurfaceVariant, - ) - ) - backgroundColor = ta.getColor(0, defaultBackgroundColor) - title.setTextColor(ta.getColor(1, defaultTextColor)) - message.setTextColor(ta.getColor(2, defaultTextColor)) - ta.recycle() + + backgroundColor = + context.getColor(com.android.internal.R.color.materialColorSurfaceContainer) + title.setTextColor(context.getColor(com.android.internal.R.color.materialColorOnSurface)) + message.setTextColor( + context.getColor(com.android.internal.R.color.materialColorOnSurfaceVariant) + ) backgroundPaint.color = backgroundColor } } diff --git a/res/color-night-v31/popup_shade_first.xml b/res/color-night-v31/popup_shade_first.xml index 28995e32bd..e62ed9c8a9 100644 --- a/res/color-night-v31/popup_shade_first.xml +++ b/res/color-night-v31/popup_shade_first.xml @@ -13,5 +13,5 @@ limitations under the License. --> - + diff --git a/res/color-v31/popup_shade_first.xml b/res/color-v31/popup_shade_first.xml index be73698c2e..9a71caeb51 100644 --- a/res/color-v31/popup_shade_first.xml +++ b/res/color-v31/popup_shade_first.xml @@ -14,5 +14,5 @@ limitations under the License. --> - + diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml index 0b317bd395..aa6c618ef7 100644 --- a/res/color/overview_button.xml +++ b/res/color/overview_button.xml @@ -2,10 +2,10 @@ \ No newline at end of file diff --git a/res/color/popup_shade_first.xml b/res/color/popup_shade_first.xml index be73698c2e..9a71caeb51 100644 --- a/res/color/popup_shade_first.xml +++ b/res/color/popup_shade_first.xml @@ -14,5 +14,5 @@ limitations under the License. --> - + diff --git a/res/drawable/all_apps_tabs_background_selected.xml b/res/drawable/all_apps_tabs_background_selected.xml index 6560632fe9..f7873dab33 100644 --- a/res/drawable/all_apps_tabs_background_selected.xml +++ b/res/drawable/all_apps_tabs_background_selected.xml @@ -21,7 +21,7 @@ android:top="@dimen/all_apps_tabs_focus_vertical_inset"> - + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_selected_focused.xml b/res/drawable/all_apps_tabs_background_selected_focused.xml index e3d86c04fe..28402627ff 100644 --- a/res/drawable/all_apps_tabs_background_selected_focused.xml +++ b/res/drawable/all_apps_tabs_background_selected_focused.xml @@ -17,7 +17,7 @@ - + @@ -28,10 +28,10 @@ android:top="@dimen/all_apps_tabs_focus_border"> - + + android:color="@color/materialColorSurfaceDim" /> \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_unselected.xml b/res/drawable/all_apps_tabs_background_unselected.xml index ce7b334687..4004021dfd 100644 --- a/res/drawable/all_apps_tabs_background_unselected.xml +++ b/res/drawable/all_apps_tabs_background_unselected.xml @@ -21,7 +21,7 @@ android:top="@dimen/all_apps_tabs_focus_vertical_inset"> - + \ No newline at end of file diff --git a/res/drawable/all_apps_tabs_background_unselected_focused.xml b/res/drawable/all_apps_tabs_background_unselected_focused.xml index 0016102ef0..3564a0763e 100644 --- a/res/drawable/all_apps_tabs_background_unselected_focused.xml +++ b/res/drawable/all_apps_tabs_background_unselected_focused.xml @@ -17,7 +17,7 @@ - + @@ -28,10 +28,10 @@ android:top="@dimen/all_apps_tabs_focus_border"> - + + android:color="@color/materialColorSurfaceDim" /> \ No newline at end of file diff --git a/res/drawable/bg_letter_list_text.xml b/res/drawable/bg_letter_list_text.xml index bfdd35cf2f..073730c705 100644 --- a/res/drawable/bg_letter_list_text.xml +++ b/res/drawable/bg_letter_list_text.xml @@ -15,7 +15,7 @@ --> - + - + diff --git a/res/drawable/bg_ps_lock_button.xml b/res/drawable/bg_ps_lock_button.xml index aef1e816ef..7a20e49b22 100644 --- a/res/drawable/bg_ps_lock_button.xml +++ b/res/drawable/bg_ps_lock_button.xml @@ -21,12 +21,12 @@ android:viewportHeight="36"> + android:fillColor="@color/materialColorPrimaryFixedDim"/> + android:fillColor="@color/materialColorOnPrimaryFixed"/> \ No newline at end of file diff --git a/res/drawable/bg_ps_transition_image.xml b/res/drawable/bg_ps_transition_image.xml index dfad3cf5b3..694303c517 100644 --- a/res/drawable/bg_ps_transition_image.xml +++ b/res/drawable/bg_ps_transition_image.xml @@ -23,13 +23,13 @@ + android:fillColor="@color/materialColorOnPrimaryFixed"/> + android:fillColor="@color/materialColorPrimaryFixedDim"/> + android:fillColor="@color/materialColorOnPrimaryFixed"/> \ No newline at end of file diff --git a/res/drawable/bg_ps_unlock_button.xml b/res/drawable/bg_ps_unlock_button.xml index d5eedd293e..563c3f6d68 100644 --- a/res/drawable/bg_ps_unlock_button.xml +++ b/res/drawable/bg_ps_unlock_button.xml @@ -21,9 +21,9 @@ android:viewportHeight="36"> + android:fillColor="@color/materialColorPrimaryFixedDim"/> \ No newline at end of file diff --git a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml index a19465dba1..b0bd33bb51 100644 --- a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml +++ b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml @@ -16,6 +16,6 @@ - + diff --git a/res/drawable/button_top_rounded_bordered_ripple.xml b/res/drawable/button_top_rounded_bordered_ripple.xml index 13959f6925..723668fb39 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 e4053e3ba7..24f61dd543 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_corp_off.xml b/res/drawable/ic_corp_off.xml index d4bb2f31a9..e58e1729cf 100644 --- a/res/drawable/ic_corp_off.xml +++ b/res/drawable/ic_corp_off.xml @@ -19,6 +19,6 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_info_no_shadow.xml b/res/drawable/ic_info_no_shadow.xml index 29a81bd27c..31cf51200a 100644 --- a/res/drawable/ic_info_no_shadow.xml +++ b/res/drawable/ic_info_no_shadow.xml @@ -18,7 +18,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/materialColorOnSurface"> + android:tint="@color/materialColorOnSurface"> + android:tint="@color/materialColorOnSurface"> + android:tint="@color/materialColorOnSurface"> diff --git a/res/drawable/ic_private_profile_divider_badge.xml b/res/drawable/ic_private_profile_divider_badge.xml index 07c740d912..92292f6bd7 100644 --- a/res/drawable/ic_private_profile_divider_badge.xml +++ b/res/drawable/ic_private_profile_divider_badge.xml @@ -21,6 +21,6 @@ + android:fillColor="@color/materialColorOnSurface"/> diff --git a/res/drawable/ic_private_space_with_background.xml b/res/drawable/ic_private_space_with_background.xml index cc73f6dafe..d66549d90d 100644 --- a/res/drawable/ic_private_space_with_background.xml +++ b/res/drawable/ic_private_space_with_background.xml @@ -19,13 +19,13 @@ android:height="48dp"> + android:fillColor="@color/materialColorSurfaceContainerLowest" /> + android:fillColor="@color/materialColorOnSurface" /> + android:fillColor="@color/materialColorOnSurface" /> diff --git a/res/drawable/ic_ps_settings.xml b/res/drawable/ic_ps_settings.xml index 47edeb85ef..5453f35776 100644 --- a/res/drawable/ic_ps_settings.xml +++ b/res/drawable/ic_ps_settings.xml @@ -24,9 +24,9 @@ android:pathData="M10,10h20v20h-20z"/> + android:fillColor="@color/materialColorOnSurfaceVariant"/> + android:fillColor="@color/materialColorOnSurfaceVariant"/> \ No newline at end of file diff --git a/res/drawable/ic_schedule.xml b/res/drawable/ic_schedule.xml index 3eeb6a2c2e..d57b0a7806 100644 --- a/res/drawable/ic_schedule.xml +++ b/res/drawable/ic_schedule.xml @@ -20,6 +20,6 @@ android:viewportHeight="960" android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/ic_uninstall_no_shadow.xml b/res/drawable/ic_uninstall_no_shadow.xml index 6200054f1b..829e590780 100644 --- a/res/drawable/ic_uninstall_no_shadow.xml +++ b/res/drawable/ic_uninstall_no_shadow.xml @@ -18,7 +18,7 @@ android:height="20dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?attr/materialColorOnSurface" > + android:tint="@color/materialColorOnSurface" > diff --git a/res/drawable/icon_menu_arrow_background.xml b/res/drawable/icon_menu_arrow_background.xml index 6345c2b007..1de111ab29 100644 --- a/res/drawable/icon_menu_arrow_background.xml +++ b/res/drawable/icon_menu_arrow_background.xml @@ -21,7 +21,7 @@ android:angle="0" android:startColor="#00000000" android:centerX="0.25" - android:centerColor="?attr/materialColorSurfaceBright" - android:endColor="?attr/materialColorSurfaceBright" /> + android:centerColor="@color/materialColorSurfaceBright" + android:endColor="@color/materialColorSurfaceBright" /> \ No newline at end of file diff --git a/res/drawable/popup_background.xml b/res/drawable/popup_background.xml index 4ddd228c68..686456f7ab 100644 --- a/res/drawable/popup_background.xml +++ b/res/drawable/popup_background.xml @@ -15,6 +15,6 @@ --> - + \ No newline at end of file diff --git a/res/drawable/private_space_app_divider.xml b/res/drawable/private_space_app_divider.xml index 1ea12b3328..f92dca73d5 100644 --- a/res/drawable/private_space_app_divider.xml +++ b/res/drawable/private_space_app_divider.xml @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/res/drawable/ps_lock_background.xml b/res/drawable/ps_lock_background.xml index 0be83dbd92..bc66595ac3 100644 --- a/res/drawable/ps_lock_background.xml +++ b/res/drawable/ps_lock_background.xml @@ -21,7 +21,7 @@ - + diff --git a/res/drawable/ps_settings_background.xml b/res/drawable/ps_settings_background.xml index b0c6b5b0d1..7746012d40 100644 --- a/res/drawable/ps_settings_background.xml +++ b/res/drawable/ps_settings_background.xml @@ -18,6 +18,6 @@ android:inset="4dp"> - + \ No newline at end of file diff --git a/res/drawable/rounded_action_button.xml b/res/drawable/rounded_action_button.xml index ebfa996ac5..6ee6d65d1f 100644 --- a/res/drawable/rounded_action_button.xml +++ b/res/drawable/rounded_action_button.xml @@ -17,10 +17,10 @@ - + + android:color="@color/materialColorSurfaceContainerLow" /> diff --git a/res/drawable/work_card.xml b/res/drawable/work_card.xml index 01ec947158..0e37d4f7b9 100644 --- a/res/drawable/work_card.xml +++ b/res/drawable/work_card.xml @@ -17,7 +17,7 @@ - + diff --git a/res/drawable/work_mode_fab_background.xml b/res/drawable/work_mode_fab_background.xml index 5bad965401..ad795eb478 100644 --- a/res/drawable/work_mode_fab_background.xml +++ b/res/drawable/work_mode_fab_background.xml @@ -18,7 +18,7 @@ - + diff --git a/res/drawable/work_scheduler_background.xml b/res/drawable/work_scheduler_background.xml index 6bbf029fc4..50c81837d8 100644 --- a/res/drawable/work_scheduler_background.xml +++ b/res/drawable/work_scheduler_background.xml @@ -18,7 +18,7 @@ - + diff --git a/res/layout/private_space_header.xml b/res/layout/private_space_header.xml index 6bce2204b0..29da5aaf44 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="?attr/materialColorPrimaryFixedDim" + app:tint="@color/materialColorPrimaryFixedDim" android:scaleType="center"/> #0D0E11 #E3E2E6 + + @color/system_on_secondary_fixed_variant + @color/system_on_tertiary_fixed_variant + @color/system_surface_container_lowest_dark + @color/system_on_primary_fixed_variant + @color/system_on_secondary_container_dark + @color/system_on_tertiary_container_dark + @color/system_surface_container_low_dark + @color/system_on_primary_container_dark + @color/system_secondary_fixed_dim + @color/system_on_error_container_dark + @color/system_on_secondary_fixed + @color/system_on_surface_light + @color/system_tertiary_fixed_dim + @color/system_on_tertiary_fixed + @color/system_primary_fixed_dim + @color/system_secondary_container_dark + @color/system_error_container_dark + @color/system_on_primary_fixed + @color/system_primary_light + @color/system_secondary_fixed + @color/system_surface_light + @color/system_surface_variant_dark + @color/system_tertiary_container_dark + @color/system_tertiary_fixed + @color/system_primary_container_dark + @color/system_on_background_dark + @color/system_primary_fixed + @color/system_on_secondary_dark + @color/system_on_tertiary_dark + @color/system_surface_dim_dark + @color/system_surface_bright_dark + @color/system_on_error_dark + @color/system_surface_dark + @color/system_surface_container_high_dark + @color/system_surface_container_highest_dark + @color/system_on_surface_variant_dark + @color/system_outline_dark + @color/system_outline_variant_dark + @color/system_on_primary_dark + @color/system_on_surface_dark + @color/system_surface_container_dark + @color/system_primary_dark + @color/system_secondary_dark + @color/system_tertiary_dark + @color/system_error_dark \ No newline at end of file diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml index a891e392b8..89b635d4d4 100644 --- a/res/values-night/styles.xml +++ b/res/values-night/styles.xml @@ -27,51 +27,6 @@ diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 535d61f97f..887a708d2c 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -44,54 +44,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values/colors.xml b/res/values/colors.xml index 4549b869e4..967d97d3ae 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -256,4 +256,50 @@ #E0BBDD #2A122C #593D59 + + @color/system_on_secondary_fixed_variant + @color/system_on_tertiary_fixed_variant + @color/system_surface_container_lowest_light + @color/system_on_primary_fixed_variant + @color/system_on_secondary_container_light + @color/system_on_tertiary_container_light + @color/system_surface_container_low_light + @color/system_on_primary_container_light + @color/system_secondary_fixed_dim + @color/system_on_error_container_light + @color/system_on_secondary_fixed + @color/system_on_surface_dark + @color/system_tertiary_fixed_dim + @color/system_on_tertiary_fixed + @color/system_primary_fixed_dim + @color/system_secondary_container_light + @color/system_error_container_light + @color/system_on_primary_fixed + @color/system_primary_dark + @color/system_secondary_fixed + @color/system_surface_dark + @color/system_surface_variant_light + @color/system_tertiary_container_light + @color/system_tertiary_fixed + @color/system_primary_container_light + @color/system_on_background_light + @color/system_primary_fixed + @color/system_on_secondary_light + @color/system_on_tertiary_light + @color/system_surface_dim_light + @color/system_surface_bright_light + @color/system_on_error_light + @color/system_surface_light + @color/system_surface_container_high_light + @color/system_surface_container_highest_light + @color/system_on_surface_variant_light + @color/system_outline_light + @color/system_outline_variant_light + @color/system_on_primary_light + @color/system_on_surface_light + @color/system_surface_container_light + @color/system_primary_light + @color/system_secondary_light + @color/system_tertiary_light + @color/system_error_light diff --git a/res/values/styles.xml b/res/values/styles.xml index 1c70d6c6aa..04421c0ed2 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -30,51 +30,6 @@ diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java index c938482284..8505a6da3e 100644 --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java @@ -315,8 +315,7 @@ public class ActivityAllAppsContainerView 0, 0 // Bottom left }; - mBottomSheetBackgroundColor = - Themes.getAttrColor(getContext(), R.attr.materialColorSurfaceDim); + mBottomSheetBackgroundColor = getContext().getColor(R.color.materialColorSurfaceDim); updateBackgroundVisibility(mActivityContext.getDeviceProfile()); mSearchUiManager.initializeSearch(this); } diff --git a/src/com/android/launcher3/allapps/LetterListTextView.java b/src/com/android/launcher3/allapps/LetterListTextView.java index 8586078bc7..e3fea3ce23 100644 --- a/src/com/android/launcher3/allapps/LetterListTextView.java +++ b/src/com/android/launcher3/allapps/LetterListTextView.java @@ -31,7 +31,6 @@ import androidx.core.graphics.ColorUtils; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.util.Themes; /** * A TextView that is used to display the letter list in the fast scroller. @@ -56,7 +55,7 @@ public class LetterListTextView extends TextView { mLetterBackground = context.getDrawable(R.drawable.bg_letter_list_text); mLetterListTextWidthAndHeight = context.getResources().getDimensionPixelSize( R.dimen.fastscroll_list_letter_size); - mTextColor = Themes.getAttrColor(context, R.attr.materialColorOnSurface); + mTextColor = context.getColor(R.color.materialColorOnSurface); } @Override diff --git a/src/com/android/launcher3/allapps/SectionDecorationHandler.java b/src/com/android/launcher3/allapps/SectionDecorationHandler.java index eaeb8bbdd3..cae76ec0a6 100644 --- a/src/com/android/launcher3/allapps/SectionDecorationHandler.java +++ b/src/com/android/launcher3/allapps/SectionDecorationHandler.java @@ -27,7 +27,6 @@ import android.view.View; import androidx.annotation.Nullable; import com.android.launcher3.R; -import com.android.launcher3.util.Themes; public class SectionDecorationHandler { @@ -60,10 +59,8 @@ public class SectionDecorationHandler { mContext = context; mFillAlpha = fillAlpha; - mFocusColor = Themes.getAttrColor(context, - R.attr.materialColorSurfaceBright); // UX recommended - mFillColor = Themes.getAttrColor(context, - R.attr.materialColorSurfaceContainerHigh); // UX recommended + mFocusColor = context.getColor(R.color.materialColorSurfaceBright); // UX recommended + mFillColor = context.getColor(R.color.materialColorSurfaceContainerHigh); // UX recommended mIsTopLeftRound = isTopLeftRound; mIsTopRightRound = isTopRightRound; diff --git a/src/com/android/launcher3/popup/ArrowPopup.java b/src/com/android/launcher3/popup/ArrowPopup.java index c2debfa2ed..6174d06d7a 100644 --- a/src/com/android/launcher3/popup/ArrowPopup.java +++ b/src/com/android/launcher3/popup/ArrowPopup.java @@ -138,7 +138,7 @@ public abstract class ArrowPopup // Initialize arrow view final Resources resources = getResources(); - mArrowColor = Themes.getAttrColor(getContext(), R.attr.materialColorSurfaceContainer); + mArrowColor = getContext().getColor(R.color.materialColorSurfaceContainer); mChildContainerMargin = resources.getDimensionPixelSize(R.dimen.popup_margin); mArrowWidth = resources.getDimensionPixelSize(R.dimen.popup_arrow_width); mArrowHeight = resources.getDimensionPixelSize(R.dimen.popup_arrow_height); @@ -170,8 +170,7 @@ public abstract class ArrowPopup getContext().getColor(R.color.popup_shade_third) }; } else { - mColors = new int[]{Themes.getAttrColor(getContext(), - R.attr.materialColorSurfaceContainer)}; + mColors = new int[]{getContext().getColor(R.color.materialColorSurfaceContainer)}; } } diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java index 6fd18beb1c..4acdf198a8 100644 --- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java +++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java @@ -180,7 +180,7 @@ public class RecyclerViewFastScroller extends View { mTrackPaint.setAlpha(MAX_TRACK_ALPHA); mThumbColor = Themes.getColorAccent(context); - mThumbLetterScrollerColor = Themes.getAttrColor(context, R.attr.materialColorSurfaceBright); + mThumbLetterScrollerColor = context.getColor(R.color.materialColorSurfaceBright); mThumbPaint = new Paint(); mThumbPaint.setAntiAlias(true); mThumbPaint.setColor(mThumbColor);