diff --git a/res/layout/battery_chart_graph.xml b/res/layout/battery_chart_graph.xml index 21973a4e259..65d41cfec93 100644 --- a/res/layout/battery_chart_graph.xml +++ b/res/layout/battery_chart_graph.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginVertical="16dp" android:textAppearance="?android:attr/textAppearanceSmall" - settings:textColor="?android:attr/textColorSecondary" + android:textColor="?android:attr/textColorSecondary" android:text="@string/battery_usage_chart_graph_hint" /> "com.google.android.gms.persistent" - "dex2oat64" diff --git a/res/values/strings.xml b/res/values/strings.xml index 8cad24e3765..ab96f95f55d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -6471,6 +6471,8 @@ Background: %s Battery usage data is approximate and doesn\'t measure usage when phone is charging + + Battery usage chart diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java index a0a1417056b..3c371a068c8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryChartPreferenceControllerTest.java @@ -634,9 +634,6 @@ public final class BatteryChartPreferenceControllerTest { assertThat(mBatteryChartPreferenceController .isValidToShowEntry("com.google.android.gms.persistent")) .isFalse(); - assertThat(mBatteryChartPreferenceController - .isValidToShowEntry("dex2oat64")) - .isFalse(); } private static Map> createBatteryHistoryMap() {