Merge "Fixed battery chart flickering" into main

This commit is contained in:
Xinyi Mao
2024-12-16 02:53:08 -08:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 4 deletions

View File

@@ -36,8 +36,7 @@
android:id="@+id/battery_chart_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:alpha="0">
android:orientation="vertical">
<com.android.settings.fuelgauge.batteryusage.BatteryChartView
android:id="@+id/daily_battery_chart"
android:layout_width="match_parent"
@@ -53,7 +52,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/chartview_layout_height"
android:layout_marginBottom="16dp"
android:visibility="visible"
android:visibility="gone"
android:contentDescription="@string/hourly_battery_usage_chart"
android:textAppearance="?android:attr/textAppearanceSmall"
settings:textColor="?android:attr/textColorSecondary" />

View File

@@ -274,7 +274,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll
}
if (mDailyChartView != dailyChartView || mHourlyChartView != hourlyChartView) {
mHandler.post(() -> setBatteryChartViewInner(dailyChartView, hourlyChartView));
animateBatteryChartViewGroup();
}
if (mBatteryChartViewGroup != null) {
final View grandparentView = (View) mBatteryChartViewGroup.getParent();