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

Merge "Update view alpha to improve text color constract in Battery usage" into main

Browse Source
This commit is contained in:
Xinyi Mao
2024-05-21 05:39:46 +00:00
committed by Android (Google) Code Review
parent e0d86be017 431c14fa18
commit a05fab6dc5
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/fuelgauge/batteryusage/PowerGaugePreference.java
View File

@@ -44,6 +44,8 @@ public class PowerGaugePreference extends AppPreference {
private static final float UNSELECTABLE_ALPHA_LIGHT_MODE = 0.65f; private static final float UNSELECTABLE_ALPHA_LIGHT_MODE = 0.65f;
private static final float UNSELECTABLE_ALPHA_DARK_MODE = 0.65f; private static final float UNSELECTABLE_ALPHA_DARK_MODE = 0.65f;
private final int mTitleColorNormal;
private BatteryEntry mInfo; private BatteryEntry mInfo;
private BatteryDiffEntry mBatteryDiffEntry; private BatteryDiffEntry mBatteryDiffEntry;
private CharSequence mContentDescription; private CharSequence mContentDescription;
@@ -78,6 +80,8 @@ public class PowerGaugePreference extends AppPreference {
mInfo = info; mInfo = info;
mContentDescription = contentDescription; mContentDescription = contentDescription;
mShowAnomalyIcon = false; mShowAnomalyIcon = false;
mTitleColorNormal =
Utils.getColorAttrDefaultColor(context, android.R.attr.textColorPrimary);
} }
/** Sets the content description. */ /** Sets the content description. */
@@ -155,6 +159,13 @@ public class PowerGaugePreference extends AppPreference {
final TextView titleView = (TextView) view.findViewById(android.R.id.title); final TextView titleView = (TextView) view.findViewById(android.R.id.title);
titleView.setContentDescription(mContentDescription); titleView.setContentDescription(mContentDescription);
} }
if (!isSelectable()) {
// Set colors consistently to meet contrast requirements for non-selectable items
((TextView) view.findViewById(android.R.id.title)).setTextColor(mTitleColorNormal);
((TextView) view.findViewById(android.R.id.summary)).setTextColor(mTitleColorNormal);
subtitle.setTextColor(mTitleColorNormal);
}
} }
private static void setViewAlpha(View view, float alpha) { private static void setViewAlpha(View view, float alpha) {