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

Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e5e

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

Change-Id: Id026252a0ef651a3ef12d1e1fdbf261368f0d18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Tuttle
2023-06-20 17:06:35 +00:00
committed by Automerger Merge Worker
parent a2c73328eb bd74e47e5e
commit 4d3b967fb8
8 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/drawable/button_border_unselected.xml → res/drawable/notification_importance_button_background_selected.xml
View File

@@ -15,10 +15,11 @@
limitations under the License. limitations under the License.
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid
android:color="?attr/notification_importance_button_background_color_selected"/>
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="?androidprv:attr/materialColorOutlineVariant"/> android:color="?attr/notification_importance_button_border_color_selected"/>
<corners android:radius="@dimen/rect_button_radius" /> <corners android:radius="@dimen/rect_button_radius" />
</shape> </shape>

5
res/drawable/button_border_selected.xml → res/drawable/notification_importance_button_background_unselected.xml
View File

@@ -15,12 +15,11 @@
limitations under the License. limitations under the License.
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid <solid
android:color="?androidprv:attr/materialColorSecondaryContainer" /> android:color="?attr/notification_importance_button_background_color_unselected"/>
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="?androidprv:attr/materialColorOnSecondaryContainer"/> android:color="?attr/notification_importance_button_border_color_unselected"/>
<corners android:radius="@dimen/rect_button_radius" /> <corners android:radius="@dimen/rect_button_radius" />
</shape> </shape>

10
res/values-night/themes.xml
View File

@@ -34,6 +34,16 @@
<item name="android:colorBackground">@*android:color/surface_dark</item> <item name="android:colorBackground">@*android:color/surface_dark</item>
</style> </style>
<style name="Theme.Panel.Material" parent="Theme.Panel" >
<item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
<item name="notification_importance_button_border_color_unselected">@android:color/system_outline_variant_dark</item>
<item name="notification_importance_button_foreground_color_unselected">@android:color/system_on_surface_variant_dark</item>
<item name="notification_importance_button_background_color_selected">@android:color/system_secondary_container_dark</item>
<item name="notification_importance_button_border_color_selected">@android:color/system_on_secondary_container_dark</item>
<item name="notification_importance_button_foreground_color_selected">@android:color/system_on_secondary_container_dark</item>
</style>
<!-- Material theme for the pages containing TabLayout and ViewPager --> <!-- Material theme for the pages containing TabLayout and ViewPager -->
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight"> <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item> <item name="colorPrimary">@*android:color/edge_effect_device_default_dark</item>

8
res/values/attrs.xml
View File

@@ -194,4 +194,12 @@
<attr name="biometricsEnrollProgressHelp" format="reference|color" /> <attr name="biometricsEnrollProgressHelp" format="reference|color" />
<attr name="biometricsEnrollProgressHelpWithTalkback" format="reference|color" /> <attr name="biometricsEnrollProgressHelpWithTalkback" format="reference|color" />
</declare-styleable> </declare-styleable>
<attr name="notification_importance_button_background_color_unselected" format="color" />
<attr name="notification_importance_button_border_color_unselected" format="color" />
<attr name="notification_importance_button_foreground_color_unselected" format="color" />
<attr name="notification_importance_button_background_color_selected" format="color" />
<attr name="notification_importance_button_border_color_selected" format="color" />
<attr name="notification_importance_button_foreground_color_selected" format="color" />
</resources> </resources>

22
res/values/themes.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. limitations under the License.
--> -->
<resources> <resources
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<style name="Transparent"> <style name="Transparent">
<item name="alertDialogTheme">@style/Theme.AlertDialog</item> <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
@@ -66,6 +67,14 @@
<!-- For slice view in settings --> <!-- For slice view in settings -->
<item name="sliceViewStyle">@style/Widget.SliceView.Settings</item> <item name="sliceViewStyle">@style/Widget.SliceView.Settings</item>
<item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
<item name="notification_importance_button_border_color_unselected">?androidprv:attr/materialColorOutlineVariant</item>
<item name="notification_importance_button_foreground_color_unselected">?androidprv:attr/materialColorOnSurfaceVariant</item>
<item name="notification_importance_button_background_color_selected">?androidprv:attr/materialColorSecondaryContainer</item>
<item name="notification_importance_button_border_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
<item name="notification_importance_button_foreground_color_selected">?androidprv:attr/materialColorOnSecondaryContainer</item>
</style> </style>
<!-- Variant of the settings theme with no action bar. --> <!-- Variant of the settings theme with no action bar. -->
@@ -229,9 +238,18 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style> </style>
<style name="Theme.Panel.Material" parent="Theme.Panel" > <style name="Theme.Panel.Material" parent="Theme.Panel">
<item name="android:switchStyle">@style/Switch.SettingsLib</item> <item name="android:switchStyle">@style/Switch.SettingsLib</item>
<item name="notification_importance_button_background_color_unselected">@android:color/transparent</item>
<item name="notification_importance_button_border_color_unselected">@android:color/system_outline_variant_light</item>
<item name="notification_importance_button_foreground_color_unselected">@android:color/system_on_surface_variant_light</item>
<item name="notification_importance_button_background_color_selected">@android:color/system_secondary_container_light</item>
<item name="notification_importance_button_border_color_selected">@android:color/system_on_secondary_container_light</item>
<item name="notification_importance_button_foreground_color_selected">@android:color/system_on_secondary_container_light</item>
</style> </style>
<!-- Material theme for the pages containing TabLayout and ViewPager --> <!-- Material theme for the pages containing TabLayout and ViewPager -->
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight"> <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item> <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>

8
src/com/android/settings/notification/app/BubblePreference.java
View File

@@ -163,13 +163,13 @@ public class BubblePreference extends Preference implements View.OnClickListener
void setSelected(Context context, boolean selected) { void setSelected(Context context, boolean selected) {
mView.setBackground(mContext.getDrawable(selected mView.setBackground(mContext.getDrawable(selected
? R.drawable.button_border_selected ? R.drawable.notification_importance_button_background_selected
: R.drawable.button_border_unselected)); : R.drawable.notification_importance_button_background_unselected));
mView.setSelected(selected); mView.setSelected(selected);
int colorResId = selected int colorResId = selected
? com.android.internal.R.attr.materialColorOnSecondaryContainer ? R.attr.notification_importance_button_foreground_color_selected
: com.android.internal.R.attr.materialColorOnSurfaceVariant; : R.attr.notification_importance_button_foreground_color_unselected;
ColorStateList stateList = Utils.getColorAttr(context, colorResId); ColorStateList stateList = Utils.getColorAttr(context, colorResId);
mImageView.setImageTintList(stateList); mImageView.setImageTintList(stateList);
mTextView.setTextColor(stateList); mTextView.setTextColor(stateList);

23
src/com/android/settings/notification/app/ConversationPriorityPreference.java
View File

@@ -127,12 +127,14 @@ public class ConversationPriorityPreference extends Preference {
}); });
} }
private ColorStateList getAccentTint() { private ColorStateList getSelectedColor() {
return Utils.getColorAccent(getContext()); return Utils.getColorAttr(getContext(),
R.attr.notification_importance_button_foreground_color_selected);
} }
private ColorStateList getRegularTint() { private ColorStateList getUnselectedColor() {
return Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary); return Utils.getColorAttr(getContext(),
R.attr.notification_importance_button_foreground_color_unselected);
} }
void updateToggles(ViewGroup parent, int importance, boolean isPriority, void updateToggles(ViewGroup parent, int importance, boolean isPriority,
@@ -161,20 +163,21 @@ public class ConversationPriorityPreference extends Preference {
} }
void setSelected(View view, boolean selected) { void setSelected(View view, boolean selected) {
ColorStateList colorAccent = getAccentTint(); ColorStateList colorSelected = getSelectedColor();
ColorStateList colorNormal = getRegularTint(); ColorStateList colorUnselected = getUnselectedColor();
ImageView icon = view.findViewById(R.id.icon); ImageView icon = view.findViewById(R.id.icon);
TextView label = view.findViewById(R.id.label); TextView label = view.findViewById(R.id.label);
TextView summary = view.findViewById(R.id.summary); TextView summary = view.findViewById(R.id.summary);
icon.setImageTintList(selected ? colorAccent : colorNormal); icon.setImageTintList(selected ? colorSelected : colorUnselected);
label.setTextColor(selected ? colorAccent : colorNormal); label.setTextColor(selected ? colorSelected : colorUnselected);
summary.setTextColor(selected ? colorSelected : colorUnselected);
summary.setVisibility(selected ? VISIBLE : GONE); summary.setVisibility(selected ? VISIBLE : GONE);
view.setBackground(mContext.getDrawable(selected view.setBackground(mContext.getDrawable(selected
? R.drawable.button_border_selected ? R.drawable.notification_importance_button_background_selected
: R.drawable.button_border_unselected)); : R.drawable.notification_importance_button_background_unselected));
// a11y service won't always read the newly appearing text in the right order if the // a11y service won't always read the newly appearing text in the right order if the
// selection happens too soon (readback happens on a different thread as layout). post // selection happens too soon (readback happens on a different thread as layout). post
// the selection to make that conflict less likely // the selection to make that conflict less likely

36
src/com/android/settings/notification/app/ImportancePreference.java
View File

@@ -77,8 +77,10 @@ public class ImportancePreference extends Preference {
private void init(Context context) { private void init(Context context) {
mContext = context; mContext = context;
selectedBackground = mContext.getDrawable(R.drawable.button_border_selected); selectedBackground = mContext.getDrawable(
unselectedBackground = mContext.getDrawable(R.drawable.button_border_unselected); R.drawable.notification_importance_button_background_selected);
unselectedBackground = mContext.getDrawable(
R.drawable.notification_importance_button_background_unselected);
setLayoutResource(R.layout.notif_importance_preference); setLayoutResource(R.layout.notif_importance_preference);
} }
@@ -152,12 +154,14 @@ public class ImportancePreference extends Preference {
}); });
} }
private ColorStateList getAccentTint() { private ColorStateList getSelectedColor() {
return Utils.getColorAccent(getContext()); return Utils.getColorAttr(getContext(),
R.attr.notification_importance_button_foreground_color_selected);
} }
private ColorStateList getRegularTint() { private ColorStateList getUnselectedColor() {
return Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary); return Utils.getColorAttr(getContext(),
R.attr.notification_importance_button_foreground_color_unselected);
} }
void setImportanceSummary(ViewGroup parent, int importance, boolean fromUser) { void setImportanceSummary(ViewGroup parent, int importance, boolean fromUser) {
@@ -167,25 +171,25 @@ public class ImportancePreference extends Preference {
TransitionManager.beginDelayedTransition(parent, transition); TransitionManager.beginDelayedTransition(parent, transition);
} }
ColorStateList colorAccent = getAccentTint(); ColorStateList colorSelected = getSelectedColor();
ColorStateList colorNormal = getRegularTint(); ColorStateList colorUnselected = getUnselectedColor();
if (importance >= IMPORTANCE_DEFAULT) { if (importance >= IMPORTANCE_DEFAULT) {
parent.findViewById(R.id.silence_summary).setVisibility(GONE); parent.findViewById(R.id.silence_summary).setVisibility(GONE);
((ImageView) parent.findViewById(R.id.silence_icon)).setImageTintList(colorNormal); ((ImageView) parent.findViewById(R.id.silence_icon)).setImageTintList(colorUnselected);
((TextView) parent.findViewById(R.id.silence_label)).setTextColor(colorNormal); ((TextView) parent.findViewById(R.id.silence_label)).setTextColor(colorUnselected);
((ImageView) parent.findViewById(R.id.alert_icon)).setImageTintList(colorAccent); ((ImageView) parent.findViewById(R.id.alert_icon)).setImageTintList(colorSelected);
((TextView) parent.findViewById(R.id.alert_label)).setTextColor(colorAccent); ((TextView) parent.findViewById(R.id.alert_label)).setTextColor(colorSelected);
parent.findViewById(R.id.alert_summary).setVisibility(VISIBLE); parent.findViewById(R.id.alert_summary).setVisibility(VISIBLE);
} else { } else {
parent.findViewById(R.id.alert_summary).setVisibility(GONE); parent.findViewById(R.id.alert_summary).setVisibility(GONE);
((ImageView) parent.findViewById(R.id.alert_icon)).setImageTintList(colorNormal); ((ImageView) parent.findViewById(R.id.alert_icon)).setImageTintList(colorUnselected);
((TextView) parent.findViewById(R.id.alert_label)).setTextColor(colorNormal); ((TextView) parent.findViewById(R.id.alert_label)).setTextColor(colorUnselected);
((ImageView) parent.findViewById(R.id.silence_icon)).setImageTintList(colorAccent); ((ImageView) parent.findViewById(R.id.silence_icon)).setImageTintList(colorSelected);
((TextView) parent.findViewById(R.id.silence_label)).setTextColor(colorAccent); ((TextView) parent.findViewById(R.id.silence_label)).setTextColor(colorSelected);
parent.findViewById(R.id.silence_summary).setVisibility(VISIBLE); parent.findViewById(R.id.silence_summary).setVisibility(VISIBLE);
} }
} }