PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Battery settings main page string (1/2)" into sc-dev am: e2217fc5c5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994994

Change-Id: Ia466ce3c84adfb044339465f0dfcbc08b6587896
This commit is contained in:
Wesley Wang
2021-03-29 08:21:01 +00:00
committed by Automerger Merge Worker
parent 2f8e8dcb5e e2217fc5c5
commit d8556c43e7
5 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/fuelgauge/BatterySaverController.java
View File

@@ -111,7 +111,7 @@ public class BatterySaverController extends BasePreferenceController
Utils.formatPercentage(percent)) :
mContext.getString(R.string.battery_saver_off_summary);
} else {
return mContext.getString(R.string.battery_saver_auto_routine);
return mContext.getString(R.string.battery_saver_pref_auto_routine_summary);
}
}

15
src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip;
import android.app.AppOpsManager;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -34,7 +33,6 @@ import com.android.settings.overlay.FeatureFactory;
*/
public class BatteryManagerPreferenceController extends BasePreferenceController {
private static final String KEY_BATTERY_MANAGER = "smart_battery_manager";
private static final int ON = 1;
private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
private AppOpsManager mAppOpsManager;
private UserManager mUserManager;
@@ -56,24 +54,17 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
public void updateState(Preference preference) {
super.updateState(preference);
final int num = BatteryTipUtils.getRestrictedAppsList(mAppOpsManager, mUserManager).size();
final String setting = mPowerUsageFeatureProvider.isSmartBatterySupported()
? Settings.Global.ADAPTIVE_BATTERY_MANAGEMENT_ENABLED
: Settings.Global.APP_AUTO_RESTRICTION_ENABLED;
final boolean featureOn =
Settings.Global.getInt(mContext.getContentResolver(), setting, ON) == ON;
updateSummary(preference, featureOn, num);
updateSummary(preference, num);
}
@VisibleForTesting
void updateSummary(Preference preference, boolean featureOn, int num) {
void updateSummary(Preference preference, int num) {
if (num > 0) {
preference.setSummary(mContext.getResources().getQuantityString(
R.plurals.battery_manager_app_restricted, num, num));
} else if (featureOn) {
preference.setSummary(R.string.battery_manager_on);
} else {
preference.setSummary(R.string.battery_manager_off);
preference.setSummary(R.string.battery_manager_summary);
}
}
}