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

Fix GAR issue for battery chart description and the contrast ratio

Browse Source 
Bug: 187813918
Bug: 187811403
Test: make SettingsRoboTests
Change-Id: I4fae623a305fd1ee022336bcae35d9dd9995146d
This commit is contained in:
ykhung
2021-05-12 23:26:32 +08:00
committed by YUKAI HUNG
parent 0f8673407a
commit 2102059e2d
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/battery_chart_graph.xml
View File

@@ -28,7 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="16dp" android:layout_marginVertical="16dp"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
settings:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:text="@string/battery_usage_chart_graph_hint" /> android:text="@string/battery_usage_chart_graph_hint" />
<com.android.settings.fuelgauge.BatteryChartView <com.android.settings.fuelgauge.BatteryChartView
@@ -37,6 +37,7 @@
android:layout_height="165dp" android:layout_height="165dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:visibility="invisible" android:visibility="invisible"
android:contentDescription="@string/battery_usage_chart"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
settings:textColor="?android:attr/textColorSecondary" /> settings:textColor="?android:attr/textColorSecondary" />
<TextView <TextView

1
res/values/arrays.xml
View File

@@ -1523,7 +1523,6 @@
[CHAR LIMIT=NONE] --> [CHAR LIMIT=NONE] -->
<string-array name="allowlist_hide_entry_in_battery_usage" translatable="false"> <string-array name="allowlist_hide_entry_in_battery_usage" translatable="false">
<item>"com.google.android.gms.persistent"</item> <item>"com.google.android.gms.persistent"</item>
<item>"dex2oat64"</item>
</string-array> </string-array>
<!-- Array of titles palette list for accessibility. --> <!-- Array of titles palette list for accessibility. -->

2
res/values/strings.xml
View File

@@ -6471,6 +6471,8 @@
<string name="battery_usage_for_background_time">Background: <xliff:g id="time">%s</xliff:g></string> <string name="battery_usage_for_background_time">Background: <xliff:g id="time">%s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Battery usage main screen footer contentt --> <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer contentt -->
<string name="battery_usage_screen_footer">Battery usage data is approximate and doesn\'t measure usage when phone is charging</string> <string name="battery_usage_screen_footer">Battery usage data is approximate and doesn\'t measure usage when phone is charging</string>
<!-- [CHAR_LIMIT=NONE] Accessibility content description for battery chart view. -->
<string name="battery_usage_chart">Battery usage chart</string>
<!-- Process Stats strings --> <!-- Process Stats strings -->
<skip /> <skip />

3
tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java
View File

@@ -634,9 +634,6 @@ public final class BatteryChartPreferenceControllerTest {
assertThat(mBatteryChartPreferenceController assertThat(mBatteryChartPreferenceController
.isValidToShowEntry("com.google.android.gms.persistent")) .isValidToShowEntry("com.google.android.gms.persistent"))
.isFalse(); .isFalse();
assertThat(mBatteryChartPreferenceController
.isValidToShowEntry("dex2oat64"))
.isFalse();
} }
private static Map<Long, Map<String, BatteryHistEntry>> createBatteryHistoryMap() { private static Map<Long, Map<String, BatteryHistEntry>> createBatteryHistoryMap() {