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

Commit 01920ba0 authored by Xinyi Mao's avatar Xinyi Mao Committed by Android (Google) Code Review
Browse files

Merge changes from topic "battery_banner_prepare" into main 

* changes:
  [UR] Sync PowerAnomalyKey proto field.
  [UR] Clean up unused highUsageTip message.
parents 0aaedd10 1bd7aaf5

src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java

+0 −17
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; 
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController.BatteryTipListener;

import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;

import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;

import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;

import com.android.settingslib.utils.StringUtil;
@@ -81,22 +80,6 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment 
                        .setMessage(R.string.battery_tip_dialog_summary_message)

                        .setPositiveButton(android.R.string.ok, null)

                        .create();

            case BatteryTip.TipType.HIGH_DEVICE_USAGE:

                final HighUsageTip highUsageTip = (HighUsageTip) mBatteryTip;

                final RecyclerView view =

                        (RecyclerView)

                                LayoutInflater.from(context).inflate(R.layout.recycler_view, null);

                view.setLayoutManager(new LinearLayoutManager(context));

                view.setAdapter(new HighUsageAdapter(context, highUsageTip.getHighUsageAppList()));



                return new AlertDialog.Builder(context)

                        .setMessage(

                                getString(

                                        R.string.battery_tip_dialog_message,

                                        highUsageTip.getHighUsageAppList().size()))

                        .setView(view)

                        .setPositiveButton(android.R.string.ok, null)

                        .create();

            case BatteryTip.TipType.APP_RESTRICTION:

                final RestrictAppTip restrictAppTip = (RestrictAppTip) mBatteryTip;

                final List<AppInfo> restrictedAppList = restrictAppTip.getRestrictAppList();

src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.annotation.VisibleForTesting; 
import com.android.settings.fuelgauge.BatteryInfo;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.fuelgauge.batterytip.detectors.BatteryDefenderDetector;

import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector;

import com.android.settings.fuelgauge.batterytip.detectors.IncompatibleChargerDetector;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.overlay.FeatureFactory;

src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java

deleted100644 → 0
+0 −131
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.fuelgauge.batterytip.detectors;



import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;



import android.content.Context;

import android.os.BatteryUsageStats;

import android.os.UidBatteryConsumer;

import android.util.Log;



import androidx.annotation.VisibleForTesting;



import com.android.settings.fuelgauge.BatteryInfo;

import com.android.settings.fuelgauge.BatteryUtils;

import com.android.settings.fuelgauge.batterytip.AppInfo;

import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;

import com.android.settings.fuelgauge.batterytip.HighUsageDataParser;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.TimeUnit;



/**

 * Detector whether to show summary tip. This detector should be executed as the last {@link

 * BatteryTipDetector} since it need the most up-to-date {@code visibleTips}

 */

public class HighUsageDetector implements BatteryTipDetector {

    private static final String TAG = "HighUsageDetector";



    private BatteryTipPolicy mPolicy;

    private BatteryUsageStats mBatteryUsageStats;

    private final BatteryInfo mBatteryInfo;

    private List<AppInfo> mHighUsageAppList;

    @VisibleForTesting HighUsageDataParser mDataParser;

    @VisibleForTesting BatteryUtils mBatteryUtils;

    @VisibleForTesting boolean mDischarging;



    public HighUsageDetector(

            Context context,

            BatteryTipPolicy policy,

            BatteryUsageStats batteryUsageStats,

            BatteryInfo batteryInfo) {

        mPolicy = policy;

        mBatteryUsageStats = batteryUsageStats;

        mBatteryInfo = batteryInfo;

        mHighUsageAppList = new ArrayList<>();

        mBatteryUtils = BatteryUtils.getInstance(context);

        mDataParser =

                new HighUsageDataParser(

                        mPolicy.highUsagePeriodMs, mPolicy.highUsageBatteryDraining);

        mDischarging = batteryInfo.discharging;

    }



    @Override

    public BatteryTip detect() {

        final long lastFullChargeTimeMs =

                mBatteryUtils.calculateLastFullChargeTime(

                        mBatteryUsageStats, System.currentTimeMillis());

        if (mPolicy.highUsageEnabled && mDischarging) {

            parseBatteryData();

            if (mDataParser.isDeviceHeavilyUsed() || mPolicy.testHighUsageTip) {

                final double totalPower = mBatteryUsageStats.getConsumedPower();

                final int dischargeAmount = mBatteryUsageStats.getDischargePercentage();

                final List<UidBatteryConsumer> uidBatteryConsumers =

                        mBatteryUsageStats.getUidBatteryConsumers();

                // Sort by descending power

                uidBatteryConsumers.sort(

                        (consumer1, consumer2) ->

                                Double.compare(

                                        consumer2.getConsumedPower(),

                                        consumer1.getConsumedPower()));

                for (UidBatteryConsumer consumer : uidBatteryConsumers) {

                    final double percent =

                            mBatteryUtils.calculateBatteryPercent(

                                    consumer.getConsumedPower(), totalPower, dischargeAmount);

                    if ((percent + 0.5f < 1f)

                            || mBatteryUtils.shouldHideUidBatteryConsumer(consumer)) {

                        // Don't show it if we should hide or usage percentage is lower than 1%

                        continue;

                    }



                    mHighUsageAppList.add(

                            new AppInfo.Builder()

                                    .setUid(consumer.getUid())

                                    .setPackageName(mBatteryUtils.getPackageName(consumer.getUid()))

                                    .build());

                    if (mHighUsageAppList.size() >= mPolicy.highUsageAppCount) {

                        break;

                    }

                }



                // When in test mode, add an app if necessary

                if (mPolicy.testHighUsageTip && mHighUsageAppList.isEmpty()) {

                    mHighUsageAppList.add(

                            new AppInfo.Builder()

                                    .setPackageName(SETTINGS_PACKAGE_NAME)

                                    .setScreenOnTimeMs(TimeUnit.HOURS.toMillis(3))

                                    .build());

                }

            }

        }



        return new HighUsageTip(lastFullChargeTimeMs, mHighUsageAppList);

    }



    @VisibleForTesting

    void parseBatteryData() {

        try {

            mBatteryInfo.parseBatteryHistory(mDataParser);

        } catch (IllegalStateException e) {

            Log.e(TAG, "parseBatteryData() failed", e);

        }

    }

}

src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java

deleted100644 → 0
+0 −122
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.fuelgauge.batterytip.tips;



import android.app.settings.SettingsEnums;

import android.content.Context;

import android.os.Parcel;

import android.os.Parcelable;



import androidx.annotation.VisibleForTesting;



import com.android.settings.R;

import com.android.settings.fuelgauge.batterytip.AppInfo;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;



import java.util.List;



/** Tip to show general summary about battery life */

public class HighUsageTip extends BatteryTip {



    private final long mLastFullChargeTimeMs;

    @VisibleForTesting final List<AppInfo> mHighUsageAppList;



    public HighUsageTip(long lastFullChargeTimeMs, List<AppInfo> appList) {

        super(

                TipType.HIGH_DEVICE_USAGE,

                appList.isEmpty() ? StateType.INVISIBLE : StateType.NEW,

                true /* showDialog */);

        mLastFullChargeTimeMs = lastFullChargeTimeMs;

        mHighUsageAppList = appList;

    }



    @VisibleForTesting

    HighUsageTip(Parcel in) {

        super(in);

        mLastFullChargeTimeMs = in.readLong();

        mHighUsageAppList = in.createTypedArrayList(AppInfo.CREATOR);

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        super.writeToParcel(dest, flags);

        dest.writeLong(mLastFullChargeTimeMs);

        dest.writeTypedList(mHighUsageAppList);

    }



    @Override

    public CharSequence getTitle(Context context) {

        return context.getString(R.string.battery_tip_high_usage_title);

    }



    @Override

    public CharSequence getSummary(Context context) {

        return context.getString(R.string.battery_tip_high_usage_summary);

    }



    @Override

    public int getIconId() {

        return R.drawable.ic_perm_device_information_theme;

    }



    @Override

    public void updateState(BatteryTip tip) {

        mState = tip.mState;

    }



    @Override

    public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {

        metricsFeatureProvider.action(context, SettingsEnums.ACTION_HIGH_USAGE_TIP, mState);

        for (int i = 0, size = mHighUsageAppList.size(); i < size; i++) {

            final AppInfo appInfo = mHighUsageAppList.get(i);

            metricsFeatureProvider.action(

                    context, SettingsEnums.ACTION_HIGH_USAGE_TIP_LIST, appInfo.packageName);

        }

    }



    public long getLastFullChargeTimeMs() {

        return mLastFullChargeTimeMs;

    }



    public List<AppInfo> getHighUsageAppList() {

        return mHighUsageAppList;

    }



    @Override

    public String toString() {

        final StringBuilder stringBuilder = new StringBuilder(super.toString());

        stringBuilder.append(" {");

        for (int i = 0, size = mHighUsageAppList.size(); i < size; i++) {

            final AppInfo appInfo = mHighUsageAppList.get(i);

            stringBuilder.append(" " + appInfo.toString() + " ");

        }

        stringBuilder.append('}');



        return stringBuilder.toString();

    }



    public static final Parcelable.Creator CREATOR =

            new Parcelable.Creator() {

                public BatteryTip createFromParcel(Parcel in) {

                    return new HighUsageTip(in);

                }



                public BatteryTip[] newArray(int size) {

                    return new HighUsageTip[size];

                }

            };

}

src/com/android/settings/fuelgauge/protos/power_anomaly_event.proto

+14 −6
Original line number Diff line number Diff line
@@ -27,16 +27,22 @@ enum PowerAnomalyType{ 
  TYPE_APPS_ITEM = 1;

}



// Next id: 8

// Next id: 14

enum PowerAnomalyKey {

  KEY_BRIGHTNESS = 0;

  KEY_SCREEN_TIMEOUT = 1;

  KEY_APP_TOTAL_ALWAYS_HIGH = 2;

  KEY_APP_TOTAL_HIGHER_THAN_USUAL = 3;

  KEY_APP_ALWAYS_HIGH = 2;

  KEY_APP_THAN_USUAL = 3;

  KEY_APP_BACKGROUND_ALWAYS_HIGH = 4;

  KEY_APP_BACKGROUND_HIGHER_THAN_USUAL = 5;

  KEY_APP_BACKGROUND_THAN_USUAL = 5;

  KEY_APP_FOREGROUND_ALWAYS_HIGH = 6;

  KEY_APP_FOREGROUND_HIGHER_THAN_USUAL = 7;

  KEY_APP_FOREGROUND_THAN_USUAL = 7;

  KEY_APP_FOREGROUND_SERVICE_ALWAYS_HIGH = 8;

  KEY_APP_FOREGROUND_SERVICE_THAN_USUAL = 9;

  KEY_WAKELOCK_BACKGROUND_HOLDING_DURATION_LONG = 10;

  KEY_WAKELOCK_BACKGROUND_HOLD_RATIO_HIGH = 11;

  KEY_WAKELOCK_TOTAL_HOLD_RATIO_HIGH = 12;

  KEY_UNRESTRICTED_MODE_LONG_DURATION_HIGH_BACKGROUND = 13;

}



// Next id: 3
@@ -46,6 +52,7 @@ enum DetectRequestSourceType{ 
  TYPE_DATA_LOADER = 2;

}



// Next id: 10

message WarningBannerInfo {

  optional string title_string = 1;

  optional string description_string = 2;
@@ -61,6 +68,7 @@ message WarningBannerInfo { 
  optional int32 main_button_config_settings_value = 9;

}



// Next id: 11

message WarningItemInfo {

  optional int64 start_timestamp = 1;

  optional int64 end_timestamp = 2;