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

Commit f5a01823 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "Centralise time to full in SettingsLib" into main

parents d84c60f2 bb21c0e1

src/com/android/settings/fuelgauge/BatteryInfo.java

+2 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.settingslib.utils.StringUtil; 


public class BatteryInfo {

    private static final String TAG = "BatteryInfo";

    private static final String GLOBAL_TIME_TO_FULL_MILLIS = "time_to_full_millis";



    public CharSequence chargeLabel;

    public CharSequence remainingLabel;
@@ -152,7 +151,7 @@ public class BatteryInfo { 
    static long getSettingsChargeTimeRemaining(final Context context) {

        return Settings.Global.getLong(

                context.getContentResolver(),

                GLOBAL_TIME_TO_FULL_MILLIS, -1);

                com.android.settingslib.fuelgauge.BatteryUtils.GLOBAL_TIME_TO_FULL_MILLIS, -1);

    }



    public static void getBatteryInfo(final Context context, final Callback callback,
@@ -287,7 +286,7 @@ public class BatteryInfo { 
        if (getSettingsChargeTimeRemaining(context) != chargeTimeMs) {

            Settings.Global.putLong(

                    context.getContentResolver(),

                    GLOBAL_TIME_TO_FULL_MILLIS,

                    com.android.settingslib.fuelgauge.BatteryUtils.GLOBAL_TIME_TO_FULL_MILLIS,

                    chargeTimeMs);

        }