Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 284e049c authored by Zaiyue Xue's avatar Zaiyue Xue
Browse files

Switch Battery Usage Chart from V1 to V2. 

Test: manual
Bug: 236101166
Change-Id: I9142c0d4e00dea3771777ba9aedeab07b635fa1a
parent 6b806e31

res/layout/battery_chart_graph.xml

+12 −2
Original line number Diff line number Diff line
@@ -32,10 +32,20 @@ 
        android:text="@string/battery_usage_chart_graph_hint_last_full_charge" />



    <com.android.settings.fuelgauge.batteryusage.BatteryChartView

        android:id="@+id/battery_chart"

        android:id="@+id/daily_battery_chart"

        android:layout_width="match_parent"

        android:layout_height="170dp"

        android:layout_marginBottom="6dp"

        android:layout_marginBottom="16dp"

        android:visibility="invisible"

        android:contentDescription="@string/battery_usage_chart"

        android:textAppearance="?android:attr/textAppearanceSmall"

        settings:textColor="?android:attr/textColorSecondary" />



    <com.android.settings.fuelgauge.batteryusage.BatteryChartView

        android:id="@+id/hourly_battery_chart"

        android:layout_width="match_parent"

        android:layout_height="170dp"

        android:layout_marginBottom="16dp"

        android:visibility="invisible"

        android:contentDescription="@string/battery_usage_chart"

        android:textAppearance="?android:attr/textAppearanceSmall"

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ 
    <dimen name="chartview_trapezoid_radius">5dp</dimen>

    <dimen name="chartview_trapezoid_margin_start">1dp</dimen>

    <dimen name="chartview_trapezoid_margin_bottom">2dp</dimen>

    <dimen name="chartview_two_charts_margin">16dp</dimen>



    <!-- Dimensions for Dream settings cards -->

    <dimen name="dream_item_min_column_width">174dp</dimen>

src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import com.android.settings.core.BasePreferenceController; 
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.fuelgauge.batteryusage.BatteryChartPreferenceControllerV2;

import com.android.settings.fuelgauge.batteryusage.BatteryChartPreferenceController;

import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry;

import com.android.settings.fuelgauge.batteryusage.BatteryEntry;

import com.android.settings.fuelgauge.batteryusage.BatteryUsageStatsLoader;
@@ -179,7 +179,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
                    return null;

                }

                final BatteryDiffEntry entry =

                        BatteryChartPreferenceControllerV2.getAppBatteryUsageData(

                        BatteryChartPreferenceController.getAppBatteryUsageData(

                                mContext, mPackageName, mUserId);

                Log.d(TAG, "loadBatteryDiffEntries():\n" + entry);

                return entry;

src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java

+214 −263

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerV2.java

deleted100644 → 0
+0 −701

File deleted.

Preview size limit exceeded, changes collapsed.