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

Migrate materialColor* attributes into colors

Browse Source 
TLDR:
* This change should not break anything or change any color.
* Simplifies theming and styling while improving developer experience.
* With this  developers can often skip styling for color entirely, while ensuring consistency and preventing accidental overrides.

Bug: 374273611
Test: presubmit
Flag: EXEMPT bugfix
Change-Id: Id19038078e83c73847b1a7c686c3a3df1ecccac2
This commit is contained in:
Marcelo Arteiro
2024-11-21 13:08:11 +00:00
parent ad43c3dbc9
commit bc02103a6a
87 changed files with 245 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/res/color/all_set_bg_primary.xml
+1 -1
View File
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:color="?attr/materialColorPrimaryContainer"/>
<item android:color="@color/materialColorPrimaryContainer"/>
</selector>
quickstep/res/color/all_set_bg_tertiary.xml
+1 -1
View File
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:color="?attr/materialColorTertiary"/>
<item android:color="@color/materialColorTertiary"/>
</selector>
quickstep/res/color/bubblebar_drop_target_bg_color.xml
+1 -1
View File
@@ -15,5 +15,5 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:alpha="0.35" android:color="?attr/materialColorPrimaryContainer" />
<item android:alpha="0.35" android:color="@color/materialColorPrimaryContainer" />
</selector>
quickstep/res/color/menu_item_hover_state_color.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:state_hovered="false" android:color="?attr/materialColorSurfaceBright" />
<item android:state_hovered="true" android:color="?attr/materialColorSurfaceVariant" />
<item android:state_hovered="false" android:color="@color/materialColorSurfaceBright" />
<item android:state_hovered="true" android:color="@color/materialColorSurfaceVariant" />
</selector>
quickstep/res/color/taskbar_minimized_app_indicator_color.xml
+1 -1
View File
@@ -15,5 +15,5 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/materialColorOutline"/>
<item android:color="@color/materialColorOutline"/>
</selector>
quickstep/res/color/taskbar_running_app_indicator_color.xml
+1 -1
View File
@@ -15,5 +15,5 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/materialColorTertiary"/>
<item android:color="@color/materialColorTertiary"/>
</selector>
quickstep/res/drawable/bg_bubble_bar_drop_target.xml
+1 -1
View File
@@ -20,5 +20,5 @@
<solid android:color="@color/bubblebar_drop_target_bg_color" />
<stroke
android:width="1dp"
android:color="?attr/materialColorPrimaryContainer" />
android:color="@color/materialColorPrimaryContainer" />
</shape>
quickstep/res/drawable/bg_bubble_expanded_view_drop_target.xml
+1 -1
View File
@@ -22,6 +22,6 @@
<solid android:color="@color/bubblebar_drop_target_bg_color" />
<stroke
android:width="1dp"
android:color="?attr/materialColorPrimaryContainer" />
android:color="@color/materialColorPrimaryContainer" />
</shape>
</inset>
quickstep/res/drawable/bg_floating_desktop_select.xml
+1 -1
View File
@@ -19,5 +19,5 @@
android:shape="rectangle">
<corners android:radius="@dimen/rounded_button_radius" />
<solid android:color="?attr/materialColorPrimaryContainer" />
<solid android:color="@color/materialColorPrimaryContainer" />
</shape>
quickstep/res/drawable/bg_overview_clear_all_button.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<shape android:shape="rectangle"
android:tint="?colorButtonNormal">
<corners android:radius="@dimen/recents_clear_all_outline_radius" />
<solid android:color="?attr/materialColorSurfaceBright"/>
<solid android:color="@color/materialColorSurfaceBright"/>
</shape>
</item>
</ripple>
quickstep/res/drawable/bg_taskbar_edu_tooltip.xml
+1 -1
View File
@@ -18,5 +18,5 @@
android:shape="rectangle">
<corners android:radius="@dimen/dialogCornerRadius" />
<solid android:color="?attr/materialColorSurfaceBright"/>
<solid android:color="@color/materialColorSurfaceBright"/>
</shape>
quickstep/res/drawable/bg_wellbeing_toast.xml
+1 -1
View File
@@ -16,6 +16,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid android:color="?attr/materialColorSecondaryFixed" />
<solid android:color="@color/materialColorSecondaryFixed" />
<corners android:radius="?android:attr/dialogCornerRadius" />
</shape>
quickstep/res/drawable/ic_chevron_down.xml
+1 -1
View File
@@ -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">
<group
quickstep/res/drawable/rotate_tutorial_warning.xml
+1 -1
View File
@@ -21,6 +21,6 @@
android:viewportHeight="960"
android:viewportWidth="960">
<path
android:fillColor="?attr/materialColorOnSurface"
android:fillColor="@color/materialColorOnSurface"
android:pathData="M40,840L480,80L920,840L40,840ZM178,760L782,760L480,240L178,760ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600ZM480,500L480,500L480,500L480,500Z" />
</vector>
quickstep/res/layout-land/keyboard_quick_switch_taskview.xml
+1 -1
View File
@@ -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">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"
quickstep/res/layout-land/keyboard_quick_switch_taskview_square.xml
+1 -1
View File
@@ -23,7 +23,7 @@
android:importantForAccessibility="yes"
android:background="@drawable/keyboard_quick_switch_task_view_background"
android:clipToOutline="true"
launcher:focusBorderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="@androidprv:color/materialColorOutline">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"
quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml
+2 -2
View File
@@ -20,7 +20,7 @@
android:theme="@style/GestureTutorialActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/materialColorSurfaceContainer"
android:background="@color/materialColorSurfaceContainer"
android:fitsSystemWindows="true">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -163,7 +163,7 @@
android:layout_marginVertical="16dp"
android:text="@string/gesture_tutorial_action_button_label"
android:background="@drawable/gesture_tutorial_action_button_background"
android:backgroundTint="?attr/materialColorPrimary"
android:backgroundTint="@color/materialColorPrimary"
android:stateListAnimator="@null"
app:layout_constraintTop_toBottomOf="@id/guideline"
quickstep/res/layout/digital_wellbeing_toast.xml
+1 -1
View File
@@ -24,7 +24,7 @@
android:forceHasOverlappingRendering="false"
android:gravity="center"
android:importantForAccessibility="noHideDescendants"
android:textColor="?attr/materialColorOnSecondaryFixed"
android:textColor="@color/materialColorOnSecondaryFixed"
android:textSize="14sp"
android:autoSizeTextType="uniform"
android:autoSizeMaxTextSize="14sp"
quickstep/res/layout/gesture_tutorial_step_menu.xml
+2 -2
View File
@@ -20,7 +20,7 @@
android:theme="@style/GestureTutorialActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/materialColorSurfaceContainer"
android:background="@color/materialColorSurfaceContainer"
android:fitsSystemWindows="true">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -161,7 +161,7 @@
android:layout_marginVertical="16dp"
android:text="@string/gesture_tutorial_action_button_label"
android:background="@drawable/gesture_tutorial_action_button_background"
android:backgroundTint="?attr/materialColorPrimary"
android:backgroundTint="@color/materialColorPrimary"
android:stateListAnimator="@null"
app:layout_constraintTop_toBottomOf="@id/guideline"
quickstep/res/layout/icon_app_chip_view.xml
+1 -1
View File
@@ -26,7 +26,7 @@
android:importantForAccessibility="no"
android:autoMirrored="true"
android:elevation="@dimen/task_thumbnail_icon_menu_elevation"
android:background="?attr/materialColorSurfaceBright">
android:background="@color/materialColorSurfaceBright">
<!-- ignoring warning because the user of the anchor is a Rect where RTL is not needed -->
<!-- This anchor's bounds is in the expected location after rotations and translations are
quickstep/res/layout/keyboard_quick_switch_desktop_taskview.xml
+3 -3
View File
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:clipToOutline="true"
android:importantForAccessibility="yes"
launcher:focusBorderColor="?androidprv:attr/materialColorOutline"
launcher:focusBorderColor="@androidprv:color/materialColorOutline"
launcher:focusBorderRadius="@dimen/keyboard_quick_switch_text_button_radius">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -30,7 +30,7 @@
android:layout_width="@dimen/keyboard_quick_switch_text_button_width"
android:layout_height="@dimen/keyboard_quick_switch_taskview_height"
android:background="@drawable/keyboard_quick_switch_text_button_background"
android:backgroundTint="?androidprv:attr/materialColorSurfaceContainer"
android:backgroundTint="@androidprv:color/materialColorSurfaceContainer"
android:paddingHorizontal="@dimen/keyboard_quick_switch_text_button_horizontal_padding"
app:layout_constraintTop_toTopOf="parent"
@@ -43,7 +43,7 @@
android:layout_width="@dimen/keyboard_quick_switch_desktop_icon_size"
android:layout_height="@dimen/keyboard_quick_switch_desktop_icon_size"
android:layout_marginBottom="4dp"
android:tint="?androidprv:attr/materialColorOnSurface"
android:tint="@androidprv:color/materialColorOnSurface"
android:src="@drawable/ic_desktop"
app:layout_constraintVertical_chainStyle="packed"
quickstep/res/layout/keyboard_quick_switch_overview_taskview.xml
+2 -2
View File
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:clipToOutline="true"
android:importantForAccessibility="yes"
launcher:focusBorderColor="?androidprv:attr/materialColorOutline"
launcher:focusBorderColor="@androidprv:color/materialColorOutline"
launcher:focusBorderRadius="@dimen/keyboard_quick_switch_text_button_radius">
<androidx.constraintlayout.widget.ConstraintLayout
@@ -30,7 +30,7 @@
android:layout_width="@dimen/keyboard_quick_switch_text_button_width"
android:layout_height="@dimen/keyboard_quick_switch_taskview_height"
android:background="@drawable/keyboard_quick_switch_text_button_background"
android:backgroundTint="?androidprv:attr/materialColorSurfaceBright"
android:backgroundTint="@androidprv:color/materialColorSurfaceBright"
android:paddingHorizontal="@dimen/keyboard_quick_switch_text_button_horizontal_padding"
app:layout_constraintTop_toTopOf="parent"
quickstep/res/layout/keyboard_quick_switch_taskview.xml
+1 -1
View File
@@ -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">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"
quickstep/res/layout/keyboard_quick_switch_taskview_square.xml
+1 -1
View File
@@ -23,7 +23,7 @@
android:importantForAccessibility="yes"
android:background="@drawable/keyboard_quick_switch_task_view_background"
android:clipToOutline="true"
launcher:focusBorderColor="?androidprv:attr/materialColorOutline">
launcher:focusBorderColor="@androidprv:color/materialColorOutline">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content"
quickstep/res/layout/keyboard_quick_switch_view.xml
+1 -1
View File
@@ -44,7 +44,7 @@
android:layout_height="@dimen/keyboard_quick_switch_no_recent_items_icon_size"
android:layout_marginBottom="@dimen/keyboard_quick_switch_no_recent_items_icon_margin"
android:src="@drawable/view_carousel"
android:tint="?attr/materialColorOnSurface"
android:tint="@color/materialColorOnSurface"
android:importantForAccessibility="no"
app:layout_constraintVertical_chainStyle="packed"
quickstep/res/layout/overview_clear_all_button.xml
+2 -2
View File
@@ -23,6 +23,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/recents_clear_all"
android:textColor="?attr/materialColorOnSurface"
launcher:focusBorderColor="?attr/materialColorOutline"
android:textColor="@color/materialColorOnSurface"
launcher:focusBorderColor="@color/materialColorOutline"
android:textSize="14sp" />
quickstep/res/layout/task.xml
+2 -2
View File
@@ -25,8 +25,8 @@
android:clipChildren="false"
android:defaultFocusHighlightEnabled="false"
android:focusable="true"
launcher:focusBorderColor="?attr/materialColorOutline"
launcher:hoverBorderColor="?attr/materialColorPrimary">
launcher:focusBorderColor="@color/materialColorOutline"
launcher:hoverBorderColor="@color/materialColorPrimary">
<include layout="@layout/task_thumbnail_deprecated" />
quickstep/res/layout/task_desktop.xml
+2 -2
View File
@@ -22,8 +22,8 @@
android:contentDescription="@string/recent_task_desktop"
android:defaultFocusHighlightEnabled="false"
android:focusable="true"
launcher:focusBorderColor="?attr/materialColorOutline"
launcher:hoverBorderColor="?attr/materialColorPrimary">
launcher:focusBorderColor="@color/materialColorOutline"
launcher:hoverBorderColor="@color/materialColorPrimary">
<ViewStub
android:id="@+id/icon"
quickstep/res/layout/task_grouped.xml
+2 -2
View File
@@ -30,8 +30,8 @@
android:clipChildren="false"
android:defaultFocusHighlightEnabled="false"
android:focusable="true"
launcher:focusBorderColor="?attr/materialColorOutline"
launcher:hoverBorderColor="?attr/materialColorPrimary">
launcher:focusBorderColor="@color/materialColorOutline"
launcher:hoverBorderColor="@color/materialColorPrimary">
<include layout="@layout/task_thumbnail_deprecated"/>
quickstep/res/layout/task_view_menu_option.xml
+2 -2
View File
@@ -31,7 +31,7 @@
android:layout_height="@dimen/system_shortcut_icon_size"
android:layout_marginStart="@dimen/task_menu_option_start_margin"
android:layout_gravity="center_horizontal"
android:backgroundTint="?attr/materialColorOnSurface"/>
android:backgroundTint="@color/materialColorOnSurface"/>
<TextView
style="@style/BaseIcon"
@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/task_menu_option_text_start_margin"
android:textSize="14sp"
android:textColor="?attr/materialColorOnSurface"
android:textColor="@color/materialColorOnSurface"
android:focusable="false"
android:gravity="start"
android:ellipsize="end" />
quickstep/res/values-night/colors.xml
+1 -1
View File
@@ -25,5 +25,5 @@
<color name="all_set_page_background">@android:color/system_neutral1_900</color>
<!-- Turn on work apps button -->
<color name="work_turn_on_stroke">?attr/materialColorPrimary</color>
<color name="work_turn_on_stroke">@color/materialColorPrimary</color>
</resources>
quickstep/res/values-night/styles.xml
+10 -10
View File
@@ -73,16 +73,16 @@
<style name="GestureTutorialActivity" parent="@style/AppTheme">
<item name="background">@android:color/transparent</item>
<item name="tutorialSubtitle">@android:color/white</item>
<item name="surfaceContainer">?attr/materialColorSurfaceContainer</item>
<item name="onSurfaceHome">?attr/materialColorPrimaryFixedDim</item>
<item name="surfaceHome">?attr/materialColorOnPrimaryFixedVariant</item>
<item name="secondaryHome">?attr/materialColorOnPrimaryFixed</item>
<item name="onSurfaceBack">?attr/materialColorTertiaryFixedDim</item>
<item name="surfaceBack">?attr/materialColorOnTertiaryFixedVariant</item>
<item name="secondaryBack">?attr/materialColorOnTertiaryFixed</item>
<item name="onSurfaceOverview">?attr/materialColorPrimaryFixed</item>
<item name="surfaceOverview">?attr/materialColorOnSecondaryFixedVariant</item>
<item name="secondaryOverview">?attr/materialColorOnSecondaryFixed</item>
<item name="surfaceContainer">@color/materialColorSurfaceContainer</item>
<item name="onSurfaceHome">@color/materialColorPrimaryFixedDim</item>
<item name="surfaceHome">@color/materialColorOnPrimaryFixedVariant</item>
<item name="secondaryHome">@color/materialColorOnPrimaryFixed</item>
<item name="onSurfaceBack">@color/materialColorTertiaryFixedDim</item>
<item name="surfaceBack">@color/materialColorOnTertiaryFixedVariant</item>
<item name="secondaryBack">@color/materialColorOnTertiaryFixed</item>
<item name="onSurfaceOverview">@color/materialColorPrimaryFixed</item>
<item name="surfaceOverview">@color/materialColorOnSecondaryFixedVariant</item>
<item name="secondaryOverview">@color/materialColorOnSecondaryFixed</item>
</style>
</resources>
quickstep/res/values/colors.xml
+2 -2
View File
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<resources>
<color name="chip_hint_foreground_color">#fff</color>
<color name="chip_scrim_start_color">#39000000</color>
@@ -93,5 +93,5 @@
<color name="lottie_yellow600">#f9ab00</color>
<!-- Turn on work apps button -->
<color name="work_turn_on_stroke">?attr/materialColorPrimary</color>
<color name="work_turn_on_stroke">@color/materialColorPrimary</color>
</resources>
quickstep/res/values/styles.xml
+15 -15
View File
@@ -124,7 +124,7 @@
<style name="TextAppearance.GestureTutorial.ButtonLabel"
parent="TextAppearance.GestureTutorial.CallToAction">
<item name="android:gravity">center</item>
<item name="android:textColor">?attr/materialColorOnPrimary</item>
<item name="android:textColor">@color/materialColorOnPrimary</item>
<item name="android:letterSpacing">0.02</item>
<item name="android:textSize">16sp</item>
<item name="android:textAllCaps">false</item>
@@ -269,7 +269,7 @@
<style name="KeyboardQuickSwitchText">
<item name="fontFamily">google-sans-text</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="android:textColor">@color/materialColorOnSurface</item>
<item name="lineHeight">20sp</item>
</style>
@@ -278,7 +278,7 @@
</style>
<style name="KeyboardQuickSwitchText.OnBackground" parent="KeyboardQuickSwitchText">
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="android:textColor">@color/materialColorOnSurface</item>
</style>
<style name="KeyboardQuickSwitchText.OnTaskView" parent="KeyboardQuickSwitchText">
@@ -292,35 +292,35 @@
<style name="GestureTutorialActivity" parent="@style/AppTheme">
<item name="background">@android:color/transparent</item>
<item name="tutorialSubtitle">@android:color/black</item>
<item name="surfaceContainer">?attr/materialColorSurfaceContainer</item>
<item name="onSurfaceHome">?attr/materialColorPrimaryFixed</item>
<item name="surfaceContainer">@color/materialColorSurfaceContainer</item>
<item name="onSurfaceHome">@color/materialColorPrimaryFixed</item>
<item name="surfaceHome">@android:color/system_accent1_300</item>
<item name="secondaryHome">?attr/materialColorOnPrimaryFixedVariant</item>
<item name="onSurfaceBack">?attr/materialColorTertiaryFixed</item>
<item name="secondaryHome">@color/materialColorOnPrimaryFixedVariant</item>
<item name="onSurfaceBack">@color/materialColorTertiaryFixed</item>
<item name="surfaceBack">@android:color/system_accent3_300</item>
<item name="secondaryBack">?attr/materialColorOnTertiaryFixedVariant</item>
<item name="onSurfaceOverview">?attr/materialColorPrimaryFixed</item>
<item name="secondaryBack">@color/materialColorOnTertiaryFixedVariant</item>
<item name="onSurfaceOverview">@color/materialColorPrimaryFixed</item>
<item name="surfaceOverview">@android:color/system_accent2_300</item>
<item name="secondaryOverview">?attr/materialColorOnSecondaryFixedVariant</item>
<item name="secondaryOverview">@color/materialColorOnSecondaryFixedVariant</item>
</style>
<style name="rotate_prompt_title" parent="TextAppearance.GestureTutorial.Dialog.Title">
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="android:textColor">@color/materialColorOnSurface</item>
</style>
<style name="rotate_prompt_subtitle" parent="TextAppearance.GestureTutorial.Dialog.Subtitle">
<item name="android:textColor">?attr/materialColorOnSurfaceVariant</item>
<item name="android:textColor">@color/materialColorOnSurfaceVariant</item>
</style>
<style name="ArrowTipTaskbarStyle">
<item name="arrowTipBackground">?attr/materialColorSurfaceContainer</item>
<item name="arrowTipTextColor">?attr/materialColorOnSurface</item>
<item name="arrowTipBackground">@color/materialColorSurfaceContainer</item>
<item name="arrowTipTextColor">@color/materialColorOnSurface</item>
</style>
<style name="IconAppChipMenuTextStyle">
<item name="android:fontFamily">google-sans-text-medium</item>
<item name="android:textSize">@dimen/task_thumbnail_icon_menu_text_size</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="android:textColor">@color/materialColorOnSurface</item>
<item name="android:letterSpacing">0.025</item>
<item name="android:lineHeight">20sp</item>
</style>
quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java
+2 -3
View File
@@ -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));
quickstep/src/com/android/launcher3/taskbar/ManageWindowsTaskbarShortcut.kt
+1 -1
View File
@@ -148,7 +148,7 @@ class ManageWindowsTaskbarShortcut<T>(
) :
ManageWindowsViewContainer(
originalView.context,
Themes.getAttrColor(originalView.context, R.attr.materialColorSurfaceBright),
originalView.context.getColor(R.color.materialColorSurfaceBright),
),
TouchController {
private val taskbarActivityContext = controllers.taskbarActivityContext
quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt
+3 -6
View File
@@ -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)
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleCreator.java
+2 -9
View File
@@ -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);
quickstep/src/com/android/launcher3/taskbar/bubbles/flyout/BubbleBarFlyoutView.kt
+7 -12
View File
@@ -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
}
}
res/color-night-v31/popup_shade_first.xml
+1 -1
View File
@@ -13,5 +13,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/materialColorSurfaceContainer"/>
<item android:color="@color/materialColorSurfaceContainer"/>
</selector>
res/color-v31/popup_shade_first.xml
+1 -1
View File
@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/materialColorSurfaceContainer"/>
<item android:color="@color/materialColorSurfaceContainer"/>
</selector>
res/color/overview_button.xml
+2 -2
View File
@@ -2,10 +2,10 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:alpha="1"
android:color="?attr/materialColorOnSurface"
android:color="@color/materialColorOnSurface"
android:state_enabled="true" />
<item
android:alpha="?android:disabledAlpha"
android:color="?attr/materialColorOnSurface"
android:color="@color/materialColorOnSurface"
android:state_enabled="false" />
</selector>
res/color/popup_shade_first.xml
+1 -1
View File
@@ -14,5 +14,5 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/materialColorSurfaceContainer"/>
<item android:color="@color/materialColorSurfaceContainer"/>
</selector>
res/drawable/all_apps_tabs_background_selected.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:top="@dimen/all_apps_tabs_focus_vertical_inset">
<shape android:shape="rectangle">
<corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
<solid android:color="?attr/materialColorPrimary" />
<solid android:color="@color/materialColorPrimary" />
</shape>
</item>
</layer-list>
res/drawable/all_apps_tabs_background_selected_focused.xml
+3 -3
View File
@@ -17,7 +17,7 @@
<item>
<shape>
<corners android:radius="16dp" />
<solid android:color="?attr/materialColorPrimary" />
<solid android:color="@color/materialColorPrimary" />
</shape>
</item>
@@ -28,10 +28,10 @@
android:top="@dimen/all_apps_tabs_focus_border">
<shape android:shape="rectangle">
<corners android:radius="13dp" />
<solid android:color="?attr/materialColorPrimary" />
<solid android:color="@color/materialColorPrimary" />
<stroke
android:width="@dimen/all_apps_tabs_focus_padding"
android:color="?attr/materialColorSurfaceDim" />
android:color="@color/materialColorSurfaceDim" />
</shape>
</item>
</layer-list>
res/drawable/all_apps_tabs_background_unselected.xml
+1 -1
View File
@@ -21,7 +21,7 @@
android:top="@dimen/all_apps_tabs_focus_vertical_inset">
<shape android:shape="rectangle">
<corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
<solid android:color="?attr/materialColorSurfaceBright" />
<solid android:color="@color/materialColorSurfaceBright" />
</shape>
</item>
</layer-list>
res/drawable/all_apps_tabs_background_unselected_focused.xml
+3 -3
View File
@@ -17,7 +17,7 @@
<item>
<shape>
<corners android:radius="16dp" />
<solid android:color="?attr/materialColorPrimary" />
<solid android:color="@color/materialColorPrimary" />
</shape>
</item>
@@ -28,10 +28,10 @@
android:top="@dimen/all_apps_tabs_focus_border">
<shape android:shape="rectangle">
<corners android:radius="13dp" />
<solid android:color="?attr/materialColorSurfaceBright" />
<solid android:color="@color/materialColorSurfaceBright" />
<stroke
android:width="@dimen/all_apps_tabs_focus_padding"
android:color="?attr/materialColorSurfaceDim" />
android:color="@color/materialColorSurfaceDim" />
</shape>
</item>
</layer-list>
res/drawable/bg_letter_list_text.xml
+1 -1
View File
@@ -15,7 +15,7 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="?attr/materialColorSurface" />
<solid android:color="@color/materialColorSurface" />
<corners android:radius="100dp"/>
<size
android:width="@dimen/bg_letter_list_text_size"
res/drawable/bg_ps_header.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/ps_container_corner_radius" />
<solid android:color="?attr/materialColorSurfaceContainerHigh" />
<solid android:color="@color/materialColorSurfaceContainerHigh" />
</shape>
</item>
</ripple>
res/drawable/bg_ps_lock_button.xml
+3 -3
View File
@@ -21,12 +21,12 @@
android:viewportHeight="36">
<path
android:pathData="M18,0L71,0A18,18 0,0 1,89 18L89,18A18,18 0,0 1,71 36L18,36A18,18 0,0 1,0 18L0,18A18,18 0,0 1,18 0z"
android:fillColor="?attr/materialColorPrimaryFixedDim"/>
android:fillColor="@color/materialColorPrimaryFixedDim"/>
<path
android:pathData="M26.167,14.667H27C27.917,14.667 28.667,15.417 28.667,16.333V24.667C28.667,25.583 27.917,26.333 27,26.333H17C16.083,26.333 15.333,25.583 15.333,24.667V16.333C15.333,15.417 16.083,14.667 17,14.667H17.833V13C17.833,10.7 19.7,8.833 22,8.833C24.3,8.833 26.167,10.7 26.167,13V14.667ZM22,10.5C20.617,10.5 19.5,11.617 19.5,13V14.667H24.5V13C24.5,11.617 23.383,10.5 22,10.5ZM17,24.667V16.333H27V24.667H17ZM23.667,20.5C23.667,21.417 22.917,22.167 22,22.167C21.083,22.167 20.333,21.417 20.333,20.5C20.333,19.583 21.083,18.833 22,18.833C22.917,18.833 23.667,19.583 23.667,20.5Z"
android:fillColor="?attr/materialColorOnPrimaryFixed"
android:fillColor="@color/materialColorOnPrimaryFixed"
android:fillType="evenOdd"/>
<path
android:pathData="M41.204,23V12.976H42.73V21.544H47.504V23H41.204ZM52.352,23.224C51.615,23.224 50.976,23.061 50.434,22.734C49.893,22.398 49.473,21.936 49.174,21.348C48.885,20.76 48.74,20.083 48.74,19.318C48.74,18.543 48.885,17.867 49.174,17.288C49.473,16.7 49.893,16.243 50.434,15.916C50.976,15.58 51.615,15.412 52.352,15.412C53.099,15.412 53.738,15.58 54.27,15.916C54.812,16.243 55.227,16.7 55.516,17.288C55.815,17.867 55.964,18.543 55.964,19.318C55.964,20.083 55.815,20.76 55.516,21.348C55.227,21.936 54.812,22.398 54.27,22.734C53.738,23.061 53.099,23.224 52.352,23.224ZM52.352,21.838C52.772,21.838 53.141,21.74 53.458,21.544C53.776,21.348 54.023,21.063 54.2,20.69C54.378,20.307 54.466,19.85 54.466,19.318C54.466,18.777 54.378,18.319 54.2,17.946C54.023,17.573 53.776,17.288 53.458,17.092C53.141,16.896 52.777,16.798 52.366,16.798C51.946,16.798 51.578,16.896 51.26,17.092C50.943,17.288 50.691,17.573 50.504,17.946C50.327,18.319 50.238,18.777 50.238,19.318C50.238,19.859 50.327,20.317 50.504,20.69C50.691,21.063 50.943,21.348 51.26,21.544C51.587,21.74 51.951,21.838 52.352,21.838ZM60.899,23.224C60.199,23.224 59.583,23.065 59.051,22.748C58.528,22.421 58.118,21.964 57.819,21.376C57.529,20.788 57.385,20.102 57.385,19.318C57.385,18.525 57.534,17.839 57.833,17.26C58.141,16.672 58.561,16.219 59.093,15.902C59.634,15.575 60.255,15.412 60.955,15.412C61.832,15.412 62.556,15.631 63.125,16.07C63.694,16.509 64.039,17.111 64.161,17.876L62.705,18.114C62.611,17.713 62.411,17.395 62.103,17.162C61.804,16.919 61.412,16.798 60.927,16.798C60.544,16.798 60.199,16.896 59.891,17.092C59.583,17.279 59.335,17.559 59.149,17.932C58.972,18.305 58.883,18.767 58.883,19.318C58.883,19.859 58.972,20.321 59.149,20.704C59.326,21.077 59.569,21.362 59.877,21.558C60.185,21.745 60.535,21.838 60.927,21.838C61.394,21.838 61.771,21.721 62.061,21.488C62.36,21.255 62.579,20.909 62.719,20.452L64.133,20.788C63.956,21.507 63.596,22.095 63.055,22.552C62.514,23 61.795,23.224 60.899,23.224ZM65.985,23V12.136H67.483V18.688L70.381,15.636H72.187V15.72L69.499,18.492L72.257,22.916V23H70.549L68.435,19.598L67.483,20.564V23H65.985Z"
android:fillColor="?attr/materialColorOnPrimaryFixed"/>
android:fillColor="@color/materialColorOnPrimaryFixed"/>
</vector>
res/drawable/bg_ps_transition_image.xml
+3 -3
View File
@@ -23,13 +23,13 @@
<path
android:name="path"
android:pathData="M 19.998 36.668 C 10.816 36.668 3.332 29.184 3.332 20 C 3.332 10.818 10.816 3.334 19.998 3.334 C 20.916 3.334 21.666 4.084 21.666 5 C 21.666 5.918 20.916 6.668 19.998 6.668 C 12.648 6.668 6.666 12.65 6.666 20 C 6.666 27.35 12.648 33.334 19.998 33.334 C 27.348 33.334 33.332 27.35 33.332 20 C 33.332 19.084 34.082 18.334 34.998 18.334 C 35.916 18.334 36.666 19.084 36.666 20 C 36.666 29.184 29.182 36.668 19.998 36.668 Z"
android:fillColor="?attr/materialColorOnPrimaryFixed"/>
android:fillColor="@color/materialColorOnPrimaryFixed"/>
<path
android:name="path_3"
android:pathData="M 20 0 C 25.302 0 30.393 2.109 34.142 5.858 C 37.891 9.607 40 14.698 40 20 C 40 25.302 37.891 30.393 34.142 34.142 C 30.393 37.891 25.302 40 20 40 C 14.698 40 9.607 37.891 5.858 34.142 C 2.109 30.393 0 25.302 0 20 C 0 14.698 2.109 9.607 5.858 5.858 C 9.607 2.109 14.698 0 20 0"
android:fillColor="?attr/materialColorPrimaryFixedDim"/>
android:fillColor="@color/materialColorPrimaryFixedDim"/>
<path
android:name="path_4"
android:pathData="M 19.999 28.334 C 15.408 28.334 11.666 24.592 11.666 20 C 11.666 15.409 15.408 11.667 19.999 11.667 C 20.458 11.667 20.833 12.042 20.833 12.5 C 20.833 12.959 20.458 13.334 19.999 13.334 C 16.324 13.334 13.333 16.325 13.333 20 C 13.333 23.675 16.324 26.667 19.999 26.667 C 23.674 26.667 26.666 23.675 26.666 20 C 26.666 19.542 27.041 19.167 27.499 19.167 C 27.958 19.167 28.333 19.542 28.333 20 C 28.333 24.592 24.591 28.334 19.999 28.334 Z"
android:fillColor="?attr/materialColorOnPrimaryFixed"/>
android:fillColor="@color/materialColorOnPrimaryFixed"/>
</vector>
res/drawable/bg_ps_unlock_button.xml
+2 -2
View File
@@ -21,9 +21,9 @@
android:viewportHeight="36">
<path
android:pathData="M18,0L18,0A18,18 0,0 1,36 18L36,18A18,18 0,0 1,18 36L18,36A18,18 0,0 1,0 18L0,18A18,18 0,0 1,18 0z"
android:fillColor="?attr/materialColorPrimaryFixedDim"/>
android:fillColor="@color/materialColorPrimaryFixedDim"/>
<path
android:pathData="M22.167,14.667H23C23.917,14.667 24.667,15.417 24.667,16.333V24.667C24.667,25.583 23.917,26.333 23,26.333H13C12.083,26.333 11.333,25.583 11.333,24.667V16.333C11.333,15.417 12.083,14.667 13,14.667H13.833V13C13.833,10.7 15.7,8.833 18,8.833C20.3,8.833 22.167,10.7 22.167,13V14.667ZM18,10.5C16.617,10.5 15.5,11.617 15.5,13V14.667H20.5V13C20.5,11.617 19.383,10.5 18,10.5ZM13,24.667V16.333H23V24.667H13ZM19.667,20.5C19.667,21.417 18.917,22.167 18,22.167C17.083,22.167 16.333,21.417 16.333,20.5C16.333,19.583 17.083,18.833 18,18.833C18.917,18.833 19.667,19.583 19.667,20.5Z"
android:fillColor="?attr/materialColorOnPrimaryFixed"
android:fillColor="@color/materialColorOnPrimaryFixed"
android:fillType="evenOdd"/>
</vector>
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="?attr/materialColorOutlineVariant"/>
<solid android:color="@color/materialColorOutlineVariant"/>
<corners android:radius="@dimen/bottom_sheet_handle_corner_radius" />
</shape>
res/drawable/button_top_rounded_bordered_ripple.xml
+1 -1
View File
@@ -25,7 +25,7 @@
android:topRightRadius="12dp"
android:bottomLeftRadius="4dp"
android:bottomRightRadius="4dp" />
<solid android:color="?attr/materialColorSurfaceContainerHighest"/>
<solid android:color="@color/materialColorSurfaceContainerHighest"/>
<stroke
android:width="2dp"
android:color="@color/button_bg"/>
res/drawable/ic_close_work_edu.xml
+1 -1
View File
@@ -20,6 +20,6 @@
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="?attr/materialColorOnSurface"
android:fillColor="@color/materialColorOnSurface"
android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z"/>
</vector>
res/drawable/ic_corp_off.xml
+1 -1
View File
@@ -19,6 +19,6 @@
android:viewportHeight="24">
<path
android:pathData="M16,6H20C21.11,6 22,6.89 22,8V18.99C22,19.021 21.994,19.05 21.989,19.077C21.984,19.102 21.98,19.126 21.98,19.15L20,17.17V8H10.83L8,5.17V4C8,2.89 8.89,2 10,2H14C15.11,2 16,2.89 16,4V6ZM10,6H14V4H10V6ZM19,19L8,8L6,6L2.81,2.81L1.39,4.22L3.3,6.13C2.54,6.41 2.01,7.14 2.01,8L2,19C2,20.11 2.89,21 4,21H18.17L19.78,22.61L21.19,21.2L20.82,20.83L19,19ZM4,8V19H16.17L5.17,8H4Z"
android:fillColor="?attr/materialColorOnPrimary"
android:fillColor="@color/materialColorOnPrimary"
android:fillType="evenOdd"/>
</vector>
res/drawable/ic_info_no_shadow.xml
+1 -1
View File
@@ -18,7 +18,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/materialColorOnSurface">
android:tint="@color/materialColorOnSurface">
<path
android:fillColor="@android:color/white"
res/drawable/ic_install_no_shadow.xml
+1 -1
View File
@@ -18,7 +18,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/materialColorOnSurface">
android:tint="@color/materialColorOnSurface">
<path
android:fillColor="@android:color/white"
res/drawable/ic_install_to_private.xml
+1 -1
View File
@@ -20,7 +20,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/materialColorOnSurface">
android:tint="@color/materialColorOnSurface">
<group>
<clip-path
res/drawable/ic_lock.xml
+1 -1
View File
@@ -19,6 +19,6 @@
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="?attr/materialColorOnPrimaryFixed"
android:fillColor="@color/materialColorOnPrimaryFixed"
android:pathData="M263.72,864Q234,864 213,842.85Q192,821.7 192,792L192,408Q192,378.3 213.15,357.15Q234.3,336 264,336L288,336L288,240Q288,160.32 344.23,104.16Q400.45,48 480.23,48Q560,48 616,104.16Q672,160.32 672,240L672,336L696,336Q725.7,336 746.85,357.15Q768,378.3 768,408L768,792Q768,821.7 746.84,842.85Q725.68,864 695.96,864L263.72,864ZM264,792L696,792Q696,792 696,792Q696,792 696,792L696,408Q696,408 696,408Q696,408 696,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792ZM480.21,672Q510,672 531,650.79Q552,629.58 552,599.79Q552,570 530.79,549Q509.58,528 479.79,528Q450,528 429,549.21Q408,570.42 408,600.21Q408,630 429.21,651Q450.42,672 480.21,672ZM360,336L600,336L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,336ZM264,792Q264,792 264,792Q264,792 264,792L264,408Q264,408 264,408Q264,408 264,408L264,408Q264,408 264,408Q264,408 264,408L264,792Q264,792 264,792Q264,792 264,792L264,792Z"/>
</vector>
res/drawable/ic_private_profile_divider_badge.xml
+1 -1
View File
@@ -21,6 +21,6 @@
<group>
<path
android:pathData="M5,9L15,9A1,1 0,0 1,16 10L16,10A1,1 0,0 1,15 11L5,11A1,1 0,0 1,4 10L4,10A1,1 0,0 1,5 9z"
android:fillColor="?attr/materialColorOnSurface"/>
android:fillColor="@color/materialColorOnSurface"/>
</group>
</vector>
res/drawable/ic_private_space_with_background.xml
+3 -3
View File
@@ -19,13 +19,13 @@
android:height="48dp">
<path
android:pathData="M48 24A24 24 0 0 1 0 24A24 24 0 0 1 48 24Z"
android:fillColor="?attr/materialColorSurfaceContainerLowest" />
android:fillColor="@color/materialColorSurfaceContainerLowest" />
<path
android:pathData="M24.0021 10.6641L13.3354 14.6641V22.7841C13.3354 29.5174 17.8821 35.7974 24.0021 37.3307C30.1221 35.7974 34.6688 29.5174 34.6688 22.7841V14.6641L24.0021 10.6641ZM32.0021 22.7841C32.0021 28.1174 28.6021 33.0507 24.0021 34.5574C19.4021 33.0507 16.0021 28.1307 16.0021 22.7841V16.5174L24.0021 13.5174L32.0021 16.5174V22.7841Z"
android:fillType="evenOdd"
android:fillColor="?attr/materialColorOnSurface" />
android:fillColor="@color/materialColorOnSurface" />
<path
android:pathData="M19.3354 20.6657C19.3354 22.7724 20.7488 24.5457 22.6688 25.119V31.999H25.3354V30.6657H28.0021V27.999H25.3354V25.119C27.2554 24.5457 28.6688 22.7857 28.6688 20.6657C28.6688 18.0924 26.5754 15.999 24.0021 15.999C21.4288 15.999 19.3354 18.0924 19.3354 20.6657ZM26.0021 20.6657C26.0021 21.7724 25.1088 22.6657 24.0021 22.6657C22.8954 22.6657 22.0021 21.7724 22.0021 20.6657C22.0021 19.559 22.8954 18.6657 24.0021 18.6657C25.1088 18.6657 26.0021 19.559 26.0021 20.6657Z"
android:fillType="evenOdd"
android:fillColor="?attr/materialColorOnSurface" />
android:fillColor="@color/materialColorOnSurface" />
</vector>
res/drawable/ic_ps_settings.xml
+2 -2
View File
@@ -24,9 +24,9 @@
android:pathData="M10,10h20v20h-20z"/>
<path
android:pathData="M21.542,28.542H18.458C17.841,28.542 17.325,28.092 17.25,27.483L17.025,25.908C16.8,25.792 16.583,25.667 16.367,25.525L14.866,26.125C14.283,26.342 13.642,26.1 13.358,25.583L11.833,22.942C11.542,22.392 11.667,21.742 12.133,21.375L13.408,20.383C13.4,20.258 13.392,20.133 13.392,20C13.392,19.875 13.4,19.742 13.408,19.617L12.142,18.625C11.65,18.25 11.525,17.575 11.833,17.058L13.375,14.4C13.658,13.883 14.3,13.65 14.866,13.875L16.375,14.483C16.591,14.342 16.808,14.217 17.025,14.1L17.25,12.508C17.325,11.925 17.841,11.467 18.45,11.467H21.533C22.15,11.467 22.667,11.917 22.742,12.525L22.966,14.1C23.191,14.217 23.408,14.342 23.625,14.483L25.125,13.883C25.716,13.667 26.358,13.908 26.642,14.425L28.175,17.075C28.475,17.625 28.341,18.275 27.875,18.642L26.608,19.633C26.617,19.758 26.625,19.883 26.625,20.017C26.625,20.15 26.617,20.275 26.608,20.4L27.875,21.392C28.341,21.767 28.475,22.417 28.183,22.942L26.633,25.625C26.35,26.142 25.708,26.375 25.133,26.15L23.633,25.55C23.417,25.692 23.2,25.817 22.983,25.933L22.758,27.525C22.675,28.092 22.158,28.542 21.542,28.542ZM21.1,27.267C21.1,27.275 21.1,27.275 21.1,27.283V27.267ZM18.9,27.25V27.267C18.908,27.267 18.908,27.258 18.9,27.25ZM18.85,26.875H21.15L21.458,24.75L21.9,24.567C22.267,24.417 22.633,24.2 23.017,23.917L23.392,23.633L25.375,24.433L26.525,22.433L24.833,21.117L24.892,20.65C24.917,20.433 24.941,20.225 24.941,20C24.941,19.775 24.917,19.558 24.892,19.35L24.833,18.883L26.525,17.567L25.367,15.567L23.375,16.367L23,16.075C22.65,15.808 22.275,15.592 21.892,15.433L21.458,15.25L21.15,13.125H18.85L18.542,15.25L18.1,15.425C17.733,15.583 17.367,15.792 16.983,16.083L16.608,16.358L14.625,15.567L13.467,17.558L15.158,18.875L15.1,19.342C15.075,19.558 15.05,19.783 15.05,20C15.05,20.217 15.066,20.442 15.1,20.65L15.158,21.117L13.467,22.433L14.616,24.433L16.608,23.633L16.983,23.925C17.341,24.2 17.7,24.408 18.091,24.567L18.533,24.75L18.85,26.875ZM25.183,24.767C25.183,24.775 25.175,24.783 25.175,24.792L25.183,24.767ZM14.808,24.758L14.816,24.775C14.816,24.767 14.808,24.758 14.808,24.758ZM25.183,15.225C25.183,15.233 25.191,15.242 25.191,15.242L25.183,15.225ZM14.825,15.208L14.816,15.225C14.816,15.225 14.825,15.217 14.825,15.208ZM21.091,12.733C21.091,12.742 21.091,12.742 21.091,12.75V12.733ZM18.908,12.717V12.733C18.908,12.725 18.908,12.725 18.908,12.717Z"
android:fillColor="?attr/materialColorOnSurfaceVariant"/>
android:fillColor="@color/materialColorOnSurfaceVariant"/>
<path
android:pathData="M20,22.917C21.611,22.917 22.916,21.611 22.916,20C22.916,18.389 21.611,17.083 20,17.083C18.389,17.083 17.083,18.389 17.083,20C17.083,21.611 18.389,22.917 20,22.917Z"
android:fillColor="?attr/materialColorOnSurfaceVariant"/>
android:fillColor="@color/materialColorOnSurfaceVariant"/>
</group>
</vector>
res/drawable/ic_schedule.xml
+1 -1
View File
@@ -20,6 +20,6 @@
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="?attr/materialColorOnPrimary"
android:fillColor="@color/materialColorOnPrimary"
android:pathData="M612,668L668,612L520,464L520,280L440,280L440,496L612,668ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
</vector>
res/drawable/ic_uninstall_no_shadow.xml
+1 -1
View File
@@ -18,7 +18,7 @@
android:height="20dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/materialColorOnSurface" >
android:tint="@color/materialColorOnSurface" >
<path
android:fillColor="@android:color/white"
android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V6h1V4H15z M17,19H7V6h10V19z" />
res/drawable/icon_menu_arrow_background.xml
+2 -2
View File
@@ -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" />
<corners android:radius="@dimen/dialogCornerRadius" />
</shape>
res/drawable/popup_background.xml
+1 -1
View File
@@ -15,6 +15,6 @@
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/materialColorSurfaceContainer"/>
<solid android:color="@color/materialColorSurfaceContainer"/>
<corners android:radius="@dimen/dialogCornerRadius"/>
</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="?attr/materialColorOutlineVariant"/>
<solid android:color="@color/materialColorOutlineVariant"/>
<size android:height="@dimen/all_apps_divider_height" />
</shape>
res/drawable/ps_lock_background.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<inset android:inset="4dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/ps_lock_corner_radius" />
<solid android:color="?attr/materialColorPrimaryFixedDim" />
<solid android:color="@color/materialColorPrimaryFixedDim" />
<padding
android:left="@dimen/ps_lock_button_background_padding"
android:right="@dimen/ps_lock_button_background_padding" />
res/drawable/ps_settings_background.xml
+1 -1
View File
@@ -18,6 +18,6 @@
android:inset="4dp">
<shape android:shape="rectangle">
<corners android:radius="@dimen/ps_lock_corner_radius" />
<solid android:color="?attr/materialColorSurfaceBright" />
<solid android:color="@color/materialColorSurfaceBright" />
</shape>
</inset>
res/drawable/rounded_action_button.xml
+2 -2
View File
@@ -17,10 +17,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/materialColorSurfaceContainerLow" />
<solid android:color="@color/materialColorSurfaceContainerLow" />
<corners android:radius="@dimen/rounded_button_radius" />
<stroke
android:width="1dp"
android:color="?attr/materialColorSurfaceContainerLow" />
android:color="@color/materialColorSurfaceContainerLow" />
</shape>
res/drawable/work_card.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="?attr/materialColorSurfaceContainerHighest" />
<solid android:color="@color/materialColorSurfaceContainerHighest" />
<corners android:radius="@dimen/work_edu_card_radius" />
</shape>
res/drawable/work_mode_fab_background.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/work_fab_radius" />
<solid android:color="?attr/materialColorPrimary" />
<solid android:color="@color/materialColorPrimary" />
<padding
android:left="@dimen/work_mode_fab_background_horizontal_padding"
android:right="@dimen/work_mode_fab_background_horizontal_padding"/>
res/drawable/work_scheduler_background.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<item>
<shape android:shape="rectangle">
<corners android:radius="@dimen/work_fab_radius" />
<solid android:color="?attr/materialColorPrimary" />
<solid android:color="@color/materialColorPrimary" />
<padding
android:padding="@dimen/work_scheduler_background_padding" />
</shape>
res/layout/private_space_header.xml
+2 -2
View File
@@ -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"/>
<TextView
android:id="@+id/lock_text"
@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/ps_lock_icon_text_margin_start_expanded"
android:layout_marginEnd="@dimen/ps_lock_icon_text_margin_end_expanded"
android:textColor="?attr/materialColorOnPrimaryFixed"
android:textColor="@color/materialColorOnPrimaryFixed"
android:textSize="14sp"
android:text="@string/ps_container_lock_title"
android:maxLines="1"
res/layout/work_mode_fab.xml
+1 -1
View File
@@ -37,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="@dimen/work_fab_width"
android:textColor="?attr/materialColorOnPrimary"
android:textColor="@color/materialColorOnPrimary"
android:textSize="14sp"
android:includeFontPadding="false"
android:textDirection="locale"
res/values-night/colors.xml
+46
View File
@@ -17,4 +17,50 @@
<resources>
<color name="material_color_surface_container_lowest">#0D0E11</color>
<color name="material_color_on_surface">#E3E2E6</color>
<color name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</color>
<color name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</color>
<color name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</color>
<color name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</color>
<color name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</color>
<color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</color>
<color name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</color>
<color name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</color>
<color name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</color>
<color name="materialColorOnErrorContainer">@color/system_on_error_container_dark</color>
<color name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</color>
<color name="materialColorInverseOnSurface">@color/system_on_surface_light</color>
<color name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</color>
<color name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</color>
<color name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</color>
<color name="materialColorSecondaryContainer">@color/system_secondary_container_dark</color>
<color name="materialColorErrorContainer">@color/system_error_container_dark</color>
<color name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</color>
<color name="materialColorInversePrimary">@color/system_primary_light</color>
<color name="materialColorSecondaryFixed">@color/system_secondary_fixed</color>
<color name="materialColorInverseSurface">@color/system_surface_light</color>
<color name="materialColorSurfaceVariant">@color/system_surface_variant_dark</color>
<color name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</color>
<color name="materialColorTertiaryFixed">@color/system_tertiary_fixed</color>
<color name="materialColorPrimaryContainer">@color/system_primary_container_dark</color>
<color name="materialColorOnBackground">@color/system_on_background_dark</color>
<color name="materialColorPrimaryFixed">@color/system_primary_fixed</color>
<color name="materialColorOnSecondary">@color/system_on_secondary_dark</color>
<color name="materialColorOnTertiary">@color/system_on_tertiary_dark</color>
<color name="materialColorSurfaceDim">@color/system_surface_dim_dark</color>
<color name="materialColorSurfaceBright">@color/system_surface_bright_dark</color>
<color name="materialColorOnError">@color/system_on_error_dark</color>
<color name="materialColorSurface">@color/system_surface_dark</color>
<color name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</color>
<color name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</color>
<color name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</color>
<color name="materialColorOutline">@color/system_outline_dark</color>
<color name="materialColorOutlineVariant">@color/system_outline_variant_dark</color>
<color name="materialColorOnPrimary">@color/system_on_primary_dark</color>
<color name="materialColorOnSurface">@color/system_on_surface_dark</color>
<color name="materialColorSurfaceContainer">@color/system_surface_container_dark</color>
<color name="materialColorPrimary">@color/system_primary_dark</color>
<color name="materialColorSecondary">@color/system_secondary_dark</color>
<color name="materialColorTertiary">@color/system_tertiary_dark</color>
<color name="materialColorError">@color/system_error_dark</color>
</resources>
res/values-night/styles.xml
-45
View File
@@ -27,51 +27,6 @@
</style>
<style name="DynamicColorsBaseLauncherTheme" parent="@style/BaseLauncherTheme">
<item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_dark</item>
<item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_dark</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_dark</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_dark</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_dark</item>
<item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_dark</item>
<item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item>
<item name="materialColorInverseOnSurface">@color/system_on_surface_light</item>
<item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_dark</item>
<item name="materialColorErrorContainer">@color/system_error_container_dark</item>
<item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item>
<item name="materialColorInversePrimary">@color/system_primary_light</item>
<item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item>
<item name="materialColorInverseSurface">@color/system_surface_light</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_dark</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_dark</item>
<item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_dark</item>
<item name="materialColorOnBackground">@color/system_on_background_dark</item>
<item name="materialColorPrimaryFixed">@color/system_primary_fixed</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_dark</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_dark</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_dark</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_dark</item>
<item name="materialColorOnError">@color/system_on_error_dark</item>
<item name="materialColorSurface">@color/system_surface_dark</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_dark</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_dark</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_dark</item>
<item name="materialColorOutline">@color/system_outline_dark</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_dark</item>
<item name="materialColorOnPrimary">@color/system_on_primary_dark</item>
<item name="materialColorOnSurface">@color/system_on_surface_dark</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_dark</item>
<item name="materialColorPrimary">@color/system_primary_dark</item>
<item name="materialColorSecondary">@color/system_secondary_dark</item>
<item name="materialColorTertiary">@color/system_tertiary_dark</item>
<item name="materialColorError">@color/system_error_dark</item>
</style>
<style name="WidgetPickerActivityTheme" parent="@android:style/Theme.DeviceDefault.DayNight">
res/values-v30/styles.xml
-1
View File
@@ -29,6 +29,5 @@
<item name="android:windowLayoutInDisplayCutoutMode">always</item>
<item name="android:enforceStatusBarContrast">false</item>
<item name="android:enforceNavigationBarContrast">false</item>
<item name="materialColorOnPrimaryFixed">#FFFFFFFF</item>
</style>
</resources>
res/values/attrs.xml
-48
View File
@@ -44,54 +44,6 @@
<attr name="focusOutlineColor" format="color" />
<attr name="focusInnerOutlineColor" format="color" />
<!-- Recreating Dynamic Color attributes found in the system. This should be the way to go on
all launcher projects since they all inherit from launcher3. Avoid creating other color
attributes if these can be user directly. -->
<attr name="materialColorOnSecondaryFixedVariant" format="color" />
<attr name="materialColorOnTertiaryFixedVariant" format="color" />
<attr name="materialColorSurfaceContainerLowest" format="color" />
<attr name="materialColorOnPrimaryFixedVariant" format="color" />
<attr name="materialColorOnSecondaryContainer" format="color" />
<attr name="materialColorOnTertiaryContainer" format="color" />
<attr name="materialColorSurfaceContainerLow" format="color" />
<attr name="materialColorOnPrimaryContainer" format="color" />
<attr name="materialColorSecondaryFixedDim" format="color" />
<attr name="materialColorOnErrorContainer" format="color" />
<attr name="materialColorOnSecondaryFixed" format="color" />
<attr name="materialColorInverseOnSurface" format="color" />
<attr name="materialColorTertiaryFixedDim" format="color" />
<attr name="materialColorOnTertiaryFixed" format="color" />
<attr name="materialColorPrimaryFixedDim" format="color" />
<attr name="materialColorSecondaryContainer" format="color" />
<attr name="materialColorErrorContainer" format="color" />
<attr name="materialColorOnPrimaryFixed" format="color" />
<attr name="materialColorInversePrimary" format="color" />
<attr name="materialColorSecondaryFixed" format="color" />
<attr name="materialColorInverseSurface" format="color" />
<attr name="materialColorSurfaceVariant" format="color" />
<attr name="materialColorTertiaryContainer" format="color" />
<attr name="materialColorTertiaryFixed" format="color" />
<attr name="materialColorPrimaryContainer" format="color" />
<attr name="materialColorOnBackground" format="color" />
<attr name="materialColorPrimaryFixed" format="color" />
<attr name="materialColorOnSecondary" format="color" />
<attr name="materialColorOnTertiary" format="color" />
<attr name="materialColorSurfaceDim" format="color" />
<attr name="materialColorSurfaceBright" format="color" />
<attr name="materialColorOnError" format="color" />
<attr name="materialColorSurface" format="color" />
<attr name="materialColorSurfaceContainerHigh" format="color" />
<attr name="materialColorSurfaceContainerHighest" format="color" />
<attr name="materialColorOnSurfaceVariant" format="color" />
<attr name="materialColorOutline" format="color" />
<attr name="materialColorOutlineVariant" format="color" />
<attr name="materialColorOnPrimary" format="color" />
<attr name="materialColorOnSurface" format="color" />
<attr name="materialColorSurfaceContainer" format="color" />
<attr name="materialColorPrimary" format="color" />
<attr name="materialColorSecondary" format="color" />
<attr name="materialColorTertiary" format="color" />
<attr name="materialColorError" format="color" />
<attr name="pageIndicatorDotColor" format="color" />
<attr name="folderPreviewColor" format="color" />
res/values/colors.xml
+46
View File
@@ -256,4 +256,50 @@
<color name="system_tertiary_fixed_dim">#E0BBDD</color>
<color name="system_on_tertiary_fixed">#2A122C</color>
<color name="system_on_tertiary_fixed_variant">#593D59</color>
<color name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</color>
<color name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</color>
<color name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</color>
<color name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</color>
<color name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</color>
<color name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</color>
<color name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</color>
<color name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</color>
<color name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</color>
<color name="materialColorOnErrorContainer">@color/system_on_error_container_light</color>
<color name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</color>
<color name="materialColorInverseOnSurface">@color/system_on_surface_dark</color>
<color name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</color>
<color name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</color>
<color name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</color>
<color name="materialColorSecondaryContainer">@color/system_secondary_container_light</color>
<color name="materialColorErrorContainer">@color/system_error_container_light</color>
<color name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</color>
<color name="materialColorInversePrimary">@color/system_primary_dark</color>
<color name="materialColorSecondaryFixed">@color/system_secondary_fixed</color>
<color name="materialColorInverseSurface">@color/system_surface_dark</color>
<color name="materialColorSurfaceVariant">@color/system_surface_variant_light</color>
<color name="materialColorTertiaryContainer">@color/system_tertiary_container_light</color>
<color name="materialColorTertiaryFixed">@color/system_tertiary_fixed</color>
<color name="materialColorPrimaryContainer">@color/system_primary_container_light</color>
<color name="materialColorOnBackground">@color/system_on_background_light</color>
<color name="materialColorPrimaryFixed">@color/system_primary_fixed</color>
<color name="materialColorOnSecondary">@color/system_on_secondary_light</color>
<color name="materialColorOnTertiary">@color/system_on_tertiary_light</color>
<color name="materialColorSurfaceDim">@color/system_surface_dim_light</color>
<color name="materialColorSurfaceBright">@color/system_surface_bright_light</color>
<color name="materialColorOnError">@color/system_on_error_light</color>
<color name="materialColorSurface">@color/system_surface_light</color>
<color name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</color>
<color name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</color>
<color name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</color>
<color name="materialColorOutline">@color/system_outline_light</color>
<color name="materialColorOutlineVariant">@color/system_outline_variant_light</color>
<color name="materialColorOnPrimary">@color/system_on_primary_light</color>
<color name="materialColorOnSurface">@color/system_on_surface_light</color>
<color name="materialColorSurfaceContainer">@color/system_surface_container_light</color>
<color name="materialColorPrimary">@color/system_primary_light</color>
<color name="materialColorSecondary">@color/system_secondary_light</color>
<color name="materialColorTertiary">@color/system_tertiary_light</color>
<color name="materialColorError">@color/system_error_light</color>
</resources>
res/values/styles.xml
+9 -54
View File
@@ -30,51 +30,6 @@
</style>
<style name="DynamicColorsBaseLauncherTheme" parent="@style/BaseLauncherTheme">
<item name="materialColorOnSecondaryFixedVariant">@color/system_on_secondary_fixed_variant</item>
<item name="materialColorOnTertiaryFixedVariant">@color/system_on_tertiary_fixed_variant</item>
<item name="materialColorSurfaceContainerLowest">@color/system_surface_container_lowest_light</item>
<item name="materialColorOnPrimaryFixedVariant">@color/system_on_primary_fixed_variant</item>
<item name="materialColorOnSecondaryContainer">@color/system_on_secondary_container_light</item>
<item name="materialColorOnTertiaryContainer">@color/system_on_tertiary_container_light</item>
<item name="materialColorSurfaceContainerLow">@color/system_surface_container_low_light</item>
<item name="materialColorOnPrimaryContainer">@color/system_on_primary_container_light</item>
<item name="materialColorSecondaryFixedDim">@color/system_secondary_fixed_dim</item>
<item name="materialColorOnErrorContainer">@color/system_on_error_container_light</item>
<item name="materialColorOnSecondaryFixed">@color/system_on_secondary_fixed</item>
<item name="materialColorInverseOnSurface">@color/system_on_surface_dark</item>
<item name="materialColorTertiaryFixedDim">@color/system_tertiary_fixed_dim</item>
<item name="materialColorOnTertiaryFixed">@color/system_on_tertiary_fixed</item>
<item name="materialColorPrimaryFixedDim">@color/system_primary_fixed_dim</item>
<item name="materialColorSecondaryContainer">@color/system_secondary_container_light</item>
<item name="materialColorErrorContainer">@color/system_error_container_light</item>
<item name="materialColorOnPrimaryFixed">@color/system_on_primary_fixed</item>
<item name="materialColorInversePrimary">@color/system_primary_dark</item>
<item name="materialColorSecondaryFixed">@color/system_secondary_fixed</item>
<item name="materialColorInverseSurface">@color/system_surface_dark</item>
<item name="materialColorSurfaceVariant">@color/system_surface_variant_light</item>
<item name="materialColorTertiaryContainer">@color/system_tertiary_container_light</item>
<item name="materialColorTertiaryFixed">@color/system_tertiary_fixed</item>
<item name="materialColorPrimaryContainer">@color/system_primary_container_light</item>
<item name="materialColorOnBackground">@color/system_on_background_light</item>
<item name="materialColorPrimaryFixed">@color/system_primary_fixed</item>
<item name="materialColorOnSecondary">@color/system_on_secondary_light</item>
<item name="materialColorOnTertiary">@color/system_on_tertiary_light</item>
<item name="materialColorSurfaceDim">@color/system_surface_dim_light</item>
<item name="materialColorSurfaceBright">@color/system_surface_bright_light</item>
<item name="materialColorOnError">@color/system_on_error_light</item>
<item name="materialColorSurface">@color/system_surface_light</item>
<item name="materialColorSurfaceContainerHigh">@color/system_surface_container_high_light</item>
<item name="materialColorSurfaceContainerHighest">@color/system_surface_container_highest_light</item>
<item name="materialColorOnSurfaceVariant">@color/system_on_surface_variant_light</item>
<item name="materialColorOutline">@color/system_outline_light</item>
<item name="materialColorOutlineVariant">@color/system_outline_variant_light</item>
<item name="materialColorOnPrimary">@color/system_on_primary_light</item>
<item name="materialColorOnSurface">@color/system_on_surface_light</item>
<item name="materialColorSurfaceContainer">@color/system_surface_container_light</item>
<item name="materialColorPrimary">@color/system_primary_light</item>
<item name="materialColorSecondary">@color/system_secondary_light</item>
<item name="materialColorTertiary">@color/system_tertiary_light</item>
<item name="materialColorError">@color/system_error_light</item>
</style>
<style name="DynamicColorsBaseLauncherTheme.NoActionBar">
@@ -84,8 +39,8 @@
<style name="LauncherTheme" parent="@style/DynamicColorsBaseLauncherTheme">
<item name="android:textColorSecondary">#DE000000</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
<item name="allappsHeaderProtectionColor">?attr/materialColorSurfaceContainerHighest</item>
<item name="allAppsScrimColor">@color/materialColorSurfaceDim</item>
<item name="allappsHeaderProtectionColor">@color/materialColorSurfaceContainerHighest</item>
<item name="allAppsNavBarScrimColor">#66FFFFFF</item>
<item name="popupColorPrimary">@color/popup_color_primary_light</item>
<item name="popupColorSecondary">@color/popup_color_secondary_light</item>
@@ -104,15 +59,15 @@
<item name="workspaceKeyShadowColor">#89000000</item>
<item name="widgetsTheme">@style/WidgetContainerTheme</item>
<item name="pageIndicatorDotColor">@color/page_indicator_dot_color_light</item>
<item name="focusOutlineColor">?attr/materialColorSecondaryFixed</item>
<item name="focusInnerOutlineColor">?attr/materialColorOnSecondaryFixedVariant</item>
<item name="focusOutlineColor">@color/materialColorSecondaryFixed</item>
<item name="focusInnerOutlineColor">@color/materialColorOnSecondaryFixedVariant</item>
<item name="folderPreviewColor">@color/folder_preview_light</item>
<item name="folderBackgroundColor">@color/folder_background_light</item>
<item name="folderIconBorderColor">?android:attr/colorPrimary</item>
<item name="isFolderDarkText">true</item>
<item name="folderTextColor">@color/folder_text_color_light</item>
<item name="folderHintTextColor">@color/folder_hint_text_color_light</item>
<item name="appPairSurfaceInFolder">?attr/materialColorSurfaceContainerLowest</item>
<item name="appPairSurfaceInFolder">@color/materialColorSurfaceContainerLowest</item>
<item name="loadingIconColor">#CCFFFFFF</item>
<item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>
<item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>
@@ -158,8 +113,8 @@
<item name="android:textColorHint">#A0FFFFFF</item>
<item name="android:colorControlHighlight">#19FFFFFF</item>
<item name="android:colorPrimary">#FF212121</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
<item name="allappsHeaderProtectionColor">?attr/materialColorSurfaceContainerLow</item>
<item name="allAppsScrimColor">@color/materialColorSurfaceDim</item>
<item name="allappsHeaderProtectionColor">@color/materialColorSurfaceContainerLow</item>
<item name="allAppsNavBarScrimColor">#80000000</item>
<item name="popupColorPrimary">@color/popup_color_primary_dark</item>
<item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
@@ -178,7 +133,7 @@
<item name="isFolderDarkText">false</item>
<item name="folderTextColor">@color/folder_text_color_dark</item>
<item name="folderHintTextColor">@color/folder_hint_text_color_dark</item>
<item name="appPairSurfaceInFolder">?attr/materialColorSurfaceContainerLowest</item>
<item name="appPairSurfaceInFolder">@color/materialColorSurfaceContainerLowest</item>
<item name="isMainColorDark">true</item>
<item name="loadingIconColor">#99FFFFFF</item>
<item name="iconOnlyShortcutColor">#B3FFFFFF</item>
@@ -482,7 +437,7 @@
<style name="PrivateSpaceHeaderTextStyle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">?attr/materialColorOnSurface</item>
<item name="android:textColor">@color/materialColorOnSurface</item>
<item name="android:fontFamily">google-sans-text-medium</item>
<item name="android:ellipsize">end</item>
</style>
src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+1 -2
View File
@@ -315,8 +315,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
0,
0 // Bottom left
};
mBottomSheetBackgroundColor =
Themes.getAttrColor(getContext(), R.attr.materialColorSurfaceDim);
mBottomSheetBackgroundColor = getContext().getColor(R.color.materialColorSurfaceDim);
updateBackgroundVisibility(mActivityContext.getDeviceProfile());
mSearchUiManager.initializeSearch(this);
}
src/com/android/launcher3/allapps/LetterListTextView.java
+1 -2
View File
@@ -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
src/com/android/launcher3/allapps/SectionDecorationHandler.java
+2 -5
View File
@@ -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;
src/com/android/launcher3/popup/ArrowPopup.java
+2 -3
View File
@@ -138,7 +138,7 @@ public abstract class ArrowPopup<T extends Context & ActivityContext>
// 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<T extends Context & ActivityContext>
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)};
}
}
src/com/android/launcher3/views/RecyclerViewFastScroller.java
+1 -1
View File
@@ -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);