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

Commit ffcce1e7 authored by Wesley Wang's avatar Wesley Wang
Browse files

Add AOSP smart battery entries 

 - Revert "Cleanup smart battery entries (1/3)" patch only instead whole topic, updated part of codes to resolve the conflicts

This reverts commit 742e506d.

Reason for revert: b/315401539

Bug: 315401539

Change-Id: I75a4e4f75b624c90aae18288c77214c0238e43eb
parent ac869a57

res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ 
    <bool name="default_allow_sensitive_lockscreen_content">true</bool>



    <!-- Whether to enable the app battery usage list page feature. -->

    <bool name="config_app_battery_usage_list_enabled">true</bool>

    <bool name="config_app_battery_usage_list_enabled">false</bool>



    <!-- Whether sim related information is visible to the end user. -->

    <bool name="config_show_sim_info">true</bool>

res/xml/power_usage_summary.xml

+8 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2023 The Android Open Source Project

<!-- Copyright (C) 2024 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.
@@ -51,6 +51,13 @@ 
        settings:keywords="@string/keywords_battery_saver"

        settings:controller="com.android.settings.fuelgauge.BatterySaverController" />



    <Preference

        android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"

        android:key="smart_battery_manager"

        android:title="@string/smart_battery_manager_title"

        settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"

        settings:keywords="@string/keywords_battery_adaptive_preferences" />



    <SwitchPreferenceCompat

        android:key="battery_percentage"

        android:title="@string/battery_percentage"

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

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ public interface PowerUsageFeatureProvider { 
    /** Checks whether we should show usage information by slots or not */

    boolean isChartGraphSlotsEnabled(Context context);



    /** Checks whether adaptive charging feature is supported in this device */

    boolean isAdaptiveChargingSupported();



    /** Checks whether battery manager feature is supported in this device */

    boolean isBatteryManagerSupported();



    /** Returns {@code true} if current defender mode is extra defend */

    boolean isExtraDefend();

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

+10 −0
Original line number Diff line number Diff line
@@ -148,6 +148,16 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
        return false;

    }



    @Override

    public boolean isAdaptiveChargingSupported() {

        return false;

    }



    @Override

    public boolean isBatteryManagerSupported() {

        return true;

    }



    @Override

    public Intent getResumeChargeIntent(boolean isDockDefender) {

        return null;

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

0 → 100644
+85 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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;



import android.app.AppOpsManager;

import android.content.Context;

import android.os.UserManager;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.utils.StringUtil;



/** Preference controller to control the battery manager */

public class BatteryManagerPreferenceController extends BasePreferenceController {

    private static final String KEY_BATTERY_MANAGER = "smart_battery_manager";



    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;

    private AppOpsManager mAppOpsManager;

    private UserManager mUserManager;

    private boolean mEnableAppBatteryUsagePage;



    public BatteryManagerPreferenceController(Context context) {

        super(context, KEY_BATTERY_MANAGER);

        mPowerUsageFeatureProvider = FeatureFactory.getFeatureFactory()

                .getPowerUsageFeatureProvider();

        mAppOpsManager = context.getSystemService(AppOpsManager.class);

        mUserManager = context.getSystemService(UserManager.class);

        mEnableAppBatteryUsagePage =

                mContext.getResources().getBoolean(R.bool.config_app_battery_usage_list_enabled);

    }



    @Override

    public int getAvailabilityStatus() {

        if (!mPowerUsageFeatureProvider.isBatteryManagerSupported()) {

            return UNSUPPORTED_ON_DEVICE;

        }

        if (!mContext.getResources().getBoolean(R.bool.config_battery_manager_consider_ac)) {

            return AVAILABLE_UNSEARCHABLE;

        }

        return mPowerUsageFeatureProvider.isAdaptiveChargingSupported()

                ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (!mEnableAppBatteryUsagePage) {

            final int num = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager,

                    mUserManager).size();

            updateSummary(preference, num);

        }

    }



    @VisibleForTesting

    void updateSummary(Preference preference, int num) {

        if (num > 0) {

            preference.setSummary(StringUtil.getIcuPluralsString(mContext, num,

                    R.string.battery_manager_app_restricted));

        } else {

            preference.setSummary(

                    mPowerUsageFeatureProvider.isAdaptiveChargingSupported()

                            ? R.string.battery_manager_summary

                            : R.string.battery_manager_summary_unsupported);

        }

    }

}