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

Commit 2e298b25 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switch Battery Usage Chart from V1 to V2."

parents e530a172 284e049c

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;