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

Commit 628f12c1 authored by Kuan Wang's avatar Kuan Wang
Browse files

Remove isChartGraphEnabled() which should always return true after 

migration.

Bug: 253395332
Test: make RunSettingsRoboTests + manually
Change-Id: I0c4a6e00a7a9fd66d4050e5ddcf87176462067cd
parent a79edc3b

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

+10 −53
Original line number Diff line number Diff line
@@ -18,12 +18,10 @@ package com.android.settings.applications.appinfo; 


import android.content.Context;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.os.AsyncTask;

import android.os.BatteryUsageStats;

import android.os.Bundle;

import android.os.UidBatteryConsumer;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;
@@ -39,12 +37,10 @@ import com.android.settings.Utils; 
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.BatteryChartPreferenceController;

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

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

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

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -71,8 +67,6 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
    @VisibleForTesting

    BatteryDiffEntry mBatteryDiffEntry;

    @VisibleForTesting

    boolean mIsChartGraphEnabled;

    @VisibleForTesting

    final AppInfoDashboardFragment mParent;



    private Preference mPreference;
@@ -91,7 +85,6 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
        mPackageName = packageName;

        mUid = uid;

        mUserId = mContext.getUserId();

        refreshFeatureFlag(mContext);

        if (lifecycle != null) {

            lifecycle.addObserver(this);

        }
@@ -147,8 +140,7 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
                    + entry.getUid()

                    + " with BatteryEntry data");

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

                    mIsChartGraphEnabled ? Utils.formatPercentage(0) : mBatteryPercent,

                    !mIsChartGraphEnabled);

                    Utils.formatPercentage(0), /*isValidToShowSummary=*/ false);

        } else {

            Log.i(TAG, "Launch : " + mPackageName + " with package name");

            AdvancedPowerUsageDetail.startBatteryDetailPage(mParent.getActivity(), mParent,
@@ -194,7 +186,6 @@ public class AppBatteryPreferenceController extends BasePreferenceController 


    @VisibleForTesting

    void updateBatteryWithDiffEntry() {

        if (mIsChartGraphEnabled) {

        if (mBatteryDiffEntry != null && mBatteryDiffEntry.mConsumePower > 0) {

            mBatteryPercent = Utils.formatPercentage(

                    mBatteryDiffEntry.getPercentOfTotal(), /* round */ true);
@@ -204,7 +195,6 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
            mPreference.setSummary(

                    mContext.getString(R.string.no_battery_summary));

        }

        }



        mBatteryDiffEntriesLoaded = true;

        mPreference.setEnabled(mBatteryUsageStatsLoaded);
@@ -225,42 +215,9 @@ public class AppBatteryPreferenceController extends BasePreferenceController 
        }

    }



    private void refreshFeatureFlag(Context context) {

        if (isWorkProfile(context)) {

            try {

                context = context.createPackageContextAsUser(

                        context.getPackageName(), 0, UserHandle.OWNER);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "context.createPackageContextAsUser() fail: " + e);

            }

        }



        final PowerUsageFeatureProvider powerUsageFeatureProvider =

                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);

        mIsChartGraphEnabled = powerUsageFeatureProvider.isChartGraphEnabled(context);

    }



    private boolean isWorkProfile(Context context) {

        final UserManager userManager = context.getSystemService(UserManager.class);

        return userManager.isManagedProfile() && !userManager.isSystemUser();

    }



    @VisibleForTesting

    void updateBattery() {

    private void updateBattery() {

        mBatteryUsageStatsLoaded = true;

        mPreference.setEnabled(mBatteryDiffEntriesLoaded);

        if (mIsChartGraphEnabled) {

            return;

        }

        if (isBatteryStatsAvailable()) {

            final int percentOfMax = (int) mBatteryUtils.calculateBatteryPercent(

                    mUidBatteryConsumer.getConsumedPower(), mBatteryUsageStats.getConsumedPower(),

                    mBatteryUsageStats.getDischargePercentage());

            mBatteryPercent = Utils.formatPercentage(percentOfMax);

            mPreference.setSummary(mContext.getString(R.string.battery_summary, mBatteryPercent));

        } else {

            mPreference.setSummary(mContext.getString(R.string.no_battery_summary));

        }

    }



    @VisibleForTesting

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

+1 −6
Original line number Diff line number Diff line
@@ -480,15 +480,10 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        final String slotTime = bundle.getString(EXTRA_SLOT_TIME, null);

        final long totalTimeMs = foregroundTimeMs + backgroundTimeMs;

        final CharSequence usageTimeSummary;

        final boolean isChartGraphEnabled = FeatureFactory.getFactory(getContext())

                .getPowerUsageFeatureProvider(getContext()).isChartGraphEnabled(getContext());



        if (!isChartGraphEnabled && BatteryEntry.isSystemUid(uid)) {

            return null;

        }

        if (totalTimeMs == 0) {

            usageTimeSummary = getText(

                    isChartGraphEnabled && consumedPower > 0 ? R.string.battery_usage_without_time

                    consumedPower > 0 ? R.string.battery_usage_without_time

                            : R.string.battery_not_usage);

        } else if (slotTime == null) {

            // Shows summary text with last full charge if slot time is null.

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

+0 −5
Original line number Diff line number Diff line
@@ -123,11 +123,6 @@ public interface PowerUsageFeatureProvider { 
     */

    boolean isSmartBatterySupported();



    /**

     * Checks whether we should enable chart graph design or not.

     */

    boolean isChartGraphEnabled(Context context);



    /**

     * Checks whether we should show usage information by slots or not.

     */

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

+0 −5
Original line number Diff line number Diff line
@@ -138,11 +138,6 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
                com.android.internal.R.bool.config_smart_battery_available);

    }



    @Override

    public boolean isChartGraphEnabled(Context context) {

        return false;

    }



    @Override

    public boolean isChartGraphSlotsEnabled(Context context) {

        return false;

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

+8 −58
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.settings.fuelgauge.batteryusage; 
import android.content.Context;

import android.os.BatteryUsageStats;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;

import android.widget.TextView;



import androidx.annotation.NonNull;
@@ -31,8 +29,6 @@ import androidx.preference.PreferenceViewHolder; 
import com.android.settings.R;

import com.android.settings.fuelgauge.BatteryInfo;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.UsageView;



/**

 * Custom preference for displaying the battery level as chart graph.
@@ -40,50 +36,19 @@ import com.android.settings.widget.UsageView; 
public class BatteryHistoryPreference extends Preference {

    private static final String TAG = "BatteryHistoryPreference";



    @VisibleForTesting

    boolean mHideSummary;

    @VisibleForTesting

    BatteryInfo mBatteryInfo;



    private boolean mIsChartGraphEnabled;



    private TextView mSummaryView;

    private CharSequence mSummaryContent;

    private BatteryChartView mDailyChartView;

    private BatteryChartView mHourlyChartView;

    private BatteryChartPreferenceController mChartPreferenceController;



    public BatteryHistoryPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

        mIsChartGraphEnabled =

                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context)

                        .isChartGraphEnabled(context);

        Log.i(TAG, "isChartGraphEnabled: " + mIsChartGraphEnabled);

        setLayoutResource(

                mIsChartGraphEnabled

                        ? R.layout.battery_chart_graph

                        : R.layout.battery_usage_graph);

        setLayoutResource(R.layout.battery_chart_graph);

        setSelectable(false);

    }



    /** Sets the text of bottom summary. */

    public void setBottomSummary(CharSequence text) {

        mSummaryContent = text;

        if (mSummaryView != null) {

            mSummaryView.setVisibility(View.VISIBLE);

            mSummaryView.setText(mSummaryContent);

        }

        mHideSummary = false;

    }



    /** Hides the bottom summary. */

    public void hideBottomSummary() {

        if (mSummaryView != null) {

            mSummaryView.setVisibility(View.GONE);

        }

        mHideSummary = true;

    }



    void setBatteryUsageStats(@NonNull BatteryUsageStats batteryUsageStats) {

        BatteryInfo.getBatteryInfo(getContext(), info -> {

            mBatteryInfo = info;
@@ -105,7 +70,6 @@ public class BatteryHistoryPreference extends Preference { 
        if (mBatteryInfo == null) {

            return;

        }

        if (mIsChartGraphEnabled) {

        final TextView companionTextView = (TextView) view.findViewById(R.id.companion_text);

        mDailyChartView = (BatteryChartView) view.findViewById(R.id.daily_battery_chart);

        mDailyChartView.setCompanionTextView(companionTextView);
@@ -114,20 +78,6 @@ public class BatteryHistoryPreference extends Preference { 
        if (mChartPreferenceController != null) {

            mChartPreferenceController.setBatteryChartView(mDailyChartView, mHourlyChartView);

        }

        } else {

            final TextView chargeView = (TextView) view.findViewById(R.id.charge);

            chargeView.setText(mBatteryInfo.batteryPercentString);

            mSummaryView = (TextView) view.findViewById(R.id.bottom_summary);

            if (mSummaryContent != null) {

                mSummaryView.setText(mSummaryContent);

            }

            if (mHideSummary) {

                mSummaryView.setVisibility(View.GONE);

            }

            final UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);

            usageView.findViewById(R.id.label_group).setAlpha(.7f);

            mBatteryInfo.bindHistory(usageView);

        }

        BatteryUtils.logRuntime(TAG, "onBindViewHolder", startTime);

    }

}