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

fix(ColorCorrection): Palette preview text contrast Issue

Browse Source 
Root Cause: The palette preview's text color inherits dynamic colors from the BC pattern, leading to insufficient contrast against some backgrounds. This wasn't a problem in the original design, as the BC pattern was introduced later.

Solution: Set the palette preview text color to textColorPrimary to ensure the text remains legible against a wider range of background colors.

Bug: 378775277
Flag: EXEMPT bugfix
Test: atest PaletteListPreferenceTest

Change-Id: I8efb9f9d916d618b450df169292202e499d8ac0d
This commit is contained in:
Menghan Li
2024-11-14 06:45:12 +00:00
parent aa7114cf3e
commit 80f8b87e28
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accessibility/PaletteListPreference.java
View File

@@ -24,6 +24,7 @@ import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidt
import static com.google.common.primitives.Ints.max;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.Paint.FontMetrics;
import android.graphics.drawable.GradientDrawable;
import android.util.AttributeSet;
@@ -39,6 +40,7 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.google.common.primitives.Floats;
import com.google.common.primitives.Ints;
@@ -128,6 +130,8 @@ public final class PaletteListPreference extends Preference {
final List<Integer> paletteColors = getPaletteColors(context);
final List<String> paletteData = getPaletteData(context);
final ColorStateList textColor =
Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary);
final float textPadding =
context.getResources().getDimension(R.dimen.accessibility_layout_margin_start_end);
final String maxLengthData =
@@ -143,6 +147,7 @@ public final class PaletteListPreference extends Preference {
for (int i = 0; i < paletteData.size(); ++i) {
final TextView textView = new TextView(context);
textView.setText(paletteData.get(i));
textView.setTextColor(textColor);
textView.setHeight(paletteItemHeight);
textView.setPaddingRelative(Math.round(textPadding), 0, 0, 0);
textView.setGravity(Gravity.CENTER_VERTICAL);

19
tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
View File

@@ -16,17 +16,20 @@
package com.android.settings.accessibility;
import static org.junit.Assert.assertEquals;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.res.ColorStateList;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settingslib.Utils;
import org.junit.Before;
import org.junit.Test;
@@ -53,12 +56,20 @@ public final class PaletteListPreferenceTest {
@Test
public void initPaletteView_success() {
final int expectedCount =
mContext.getResources().getStringArray(R.array.setting_palette_data).length;
final ColorStateList expectedTextColor =
Utils.getColorAttr(mContext, android.R.attr.textColorPrimary);
mPaletteListPreference.onBindViewHolder(mPreferenceViewHolder);
final ViewGroup viewGroup =
mPreferenceViewHolder.itemView.findViewById(R.id.palette_view);
final int expectedCount =
mContext.getResources().getStringArray(R.array.setting_palette_data).length;
assertEquals(expectedCount, viewGroup.getChildCount());
final int childCount = viewGroup.getChildCount();
assertThat(childCount).isEqualTo(expectedCount);
for (int i = 0; i < childCount; i++) {
final TextView textView = (TextView) viewGroup.getChildAt(i);
assertThat(textView.getTextColors()).isEqualTo(expectedTextColor);
}
}
}