Merge "Include new "dex2oat64" process to map into App Optimization name" into sc-dev
diff --git a/res/layout/preference_battery_error.xml b/res/layout/preference_battery_error.xml
index 68ac6a2..05d842b 100644
--- a/res/layout/preference_battery_error.xml
+++ b/res/layout/preference_battery_error.xml
@@ -47,6 +47,7 @@
android:layout_marginTop="12dp"
android:layout_marginBottom="16dp"
android:text="@string/battery_missing_message"
+ android:textColor="@color/battery_info_error_color_black"
android:textAppearance="?android:attr/textAppearanceListItem" />
<TextView android:id="@+id/link_text"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0fe4975..adee07c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -210,4 +210,7 @@
<!-- Material inverse ripple color, useful for inverted backgrounds. -->
<color name="ripple_material_inverse">@*android:color/ripple_material_dark</color>
+
+ <!-- Battery error text color -->
+ <color name="battery_info_error_color_black">@*android:color/primary_text_default_material_light</color>
</resources>
diff --git a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
index 3c9cbaa..3bb8448 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartPreferenceController.java
@@ -332,9 +332,12 @@
mTrapezoidIndex = trapezoidIndex;
mHandler.post(() -> {
+ final long start = System.currentTimeMillis();
removeAndCacheAllPrefs();
addAllPreferences();
refreshCategoryTitle();
+ Log.d(TAG, String.format("refreshUi is finished in %d/ms",
+ (System.currentTimeMillis() - start)));
});
return true;
}