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

Commit 036dc189 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Transition BatteryAppListPreferences to BatteryUsageStats API 

Bug: 173745486
Test: make RunSettingsRoboTests
Test: male RunSettingsGoogleRoboTests

Change-Id: I7af8cbcd27433b89cb2184750c6854aa74761d0d
parent dba51aa2

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

+3 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo; 


import android.content.Context;

import android.content.pm.PackageInfo;

import android.os.BatteryStats;

import android.os.BatteryUsageStats;

import android.os.Bundle;

import android.os.UidBatteryConsumer;
@@ -112,10 +111,10 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
        if (isBatteryStatsAvailable()) {

            final UserManager userManager =

                    (UserManager) mContext.getSystemService(Context.USER_SERVICE);

            final BatteryEntry entry = new BatteryEntry(mContext, null, userManager, mSipper,

                    mUidBatteryConsumer, mPackageName);

            final BatteryEntry entry = new BatteryEntry(mContext, /* handler */null, userManager,

                    mUidBatteryConsumer, /* isHidden */ false, /* packages */ null, mPackageName);

            AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,

                    mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry, mBatteryPercent);

                    entry, mBatteryPercent);

        } else {

            AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,

                    mPackageName);

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

+7 −17
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.view.View; 
import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;



import com.android.internal.os.BatteryStatsHelper;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.Utils;
@@ -98,16 +97,14 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 


    private String mPackageName;



    @VisibleForTesting

    static void startBatteryDetailPage(Activity caller, BatteryUtils batteryUtils,

            InstrumentedPreferenceFragment fragment, BatteryStatsHelper helper, int which,

            BatteryEntry entry, String usagePercent) {

        // Initialize mStats if necessary.

        helper.getStats();



    /**

     * Launches battery details page for an individual battery consumer.

     */

    public static void startBatteryDetailPage(Activity caller,

            InstrumentedPreferenceFragment fragment, BatteryEntry entry, String usagePercent) {

        final Bundle args = new Bundle();

        final long foregroundTimeMs = entry.getTimeInForegroundMs(batteryUtils);

        final long backgroundTimeMs = entry.getTimeInBackgroundMs(batteryUtils);

        final long foregroundTimeMs = entry.getTimeInForegroundMs();

        final long backgroundTimeMs = entry.getTimeInBackgroundMs();

        final String packageName = entry.getDefaultPackageName();

        if (packageName == null) {

            // populate data for system app
@@ -142,13 +139,6 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        return UserHandle.getUserId(batteryEntry.getUid());

    }



    public static void startBatteryDetailPage(Activity caller,

            InstrumentedPreferenceFragment fragment, BatteryStatsHelper helper, int which,

            BatteryEntry entry, String usagePercent) {

        startBatteryDetailPage(caller, BatteryUtils.getInstance(caller), fragment, helper, which,

                entry, usagePercent);

    }



    public static void startBatteryDetailPage(Activity caller,

            InstrumentedPreferenceFragment fragment, String packageName) {

        final Bundle args = new Bundle(3);

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

+181 −178

File changed.

Preview size limit exceeded, changes collapsed.

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

+146 −161

File changed.

Preview size limit exceeded, changes collapsed.

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

+49 −60

File changed.

Preview size limit exceeded, changes collapsed.