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

Merge "Update Settings homepage color role mappings" into main

Browse Source
This commit is contained in:
Marcus Ge
2024-03-12 20:56:49 +00:00
committed by Android (Google) Code Review
parent 3085f01f6f 775280aa27
commit 3042a3f02b
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/homepage_preference.xml
View File

@@ -17,6 +17,7 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -77,7 +78,7 @@
android:layout_gravity="start" android:layout_gravity="start"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:maxLines="4" android:maxLines="4"
android:hyphenationFrequency="normalFast" android:hyphenationFrequency="normalFast"
android:lineBreakWordStyle="phrase" android:lineBreakWordStyle="phrase"

2
res/values-night/colors.xml
View File

@@ -19,7 +19,7 @@
<color name="homepage_accessibility_background">#783BE5</color> <color name="homepage_accessibility_background">#783BE5</color>
<color name="homepage_support_background">#3F5FBD</color> <color name="homepage_support_background">#3F5FBD</color>
<color name="contextual_card_background">@*android:color/material_grey_900</color> <color name="contextual_card_background">@*android:color/material_grey_900</color>
<color name="search_bar_background">?androidprv:attr/materialColorSurfaceContainerHigh</color> <color name="search_bar_background">?androidprv:attr/materialColorSurfaceBright</color>
<color name="notification_importance_button_unselected">#5F6368</color> <color name="notification_importance_button_unselected">#5F6368</color>
<!-- Palette list preference colors. --> <!-- Palette list preference colors. -->

2
res/values/styles.xml
View File

@@ -249,7 +249,7 @@
<item name="android:layout_gravity">center</item> <item name="android:layout_gravity">center</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textSize">@dimen/search_bar_text_size</item> <item name="android:textSize">@dimen/search_bar_text_size</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
</style> </style>

3
src/com/android/settings/Utils.java
View File

@@ -1289,7 +1289,8 @@ public final class Utils extends com.android.settingslib.Utils {
*/ */
@ColorInt @ColorInt
public static int getHomepageIconColor(Context context) { public static int getHomepageIconColor(Context context) {
return getColorAttrDefaultColor(context, android.R.attr.textColorPrimary); return getColorAttrDefaultColor(
context, com.android.internal.R.attr.materialColorOnSurface);
} }
/** /**