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

Merge "Customize the remaining time label during wireless charging." into main

Browse Source
This commit is contained in:
Yiling Chuang
2024-04-23 02:40:06 +00:00
committed by Android (Google) Code Review
parent 319245cdbe 901a46c93e
commit ce51f659df
5 changed files with 115 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/fuelgauge/BatteryInfo.java
View File

@@ -396,7 +396,11 @@ public class BatteryInfo {
chargeTimeMs <= 0
? null
: getPowerRemainingChargingLabel(
context, chargeTimeMs, info.isFastCharging, currentTimeMs);
context,
chargeTimeMs,
info.isFastCharging,
info.pluggedStatus,
currentTimeMs);
info.chargeLabel =
chargeTimeMs <= 0
@@ -428,7 +432,21 @@ public class BatteryInfo {
}
private static CharSequence getPowerRemainingChargingLabel(
Context context, long remainingTimeMs, boolean isFastCharging, long currentTimeMs) {
Context context,
long remainingTimeMs,
boolean isFastCharging,
int pluggedStatus,
long currentTimeMs) {
if (pluggedStatus == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
BatterySettingsFeatureProvider provider =
FeatureFactory.getFeatureFactory().getBatterySettingsFeatureProvider();
final CharSequence wirelessChargingRemainingLabel =
provider.getWirelessChargingRemainingLabel(
context, remainingTimeMs, currentTimeMs);
if (wirelessChargingRemainingLabel != null) {
return wirelessChargingRemainingLabel;
}
}
if (com.android.settingslib.fuelgauge.BatteryUtils.isChargingStringV2Enabled()) {
int chargeLabelResId =
isFastCharging

5
src/com/android/settings/fuelgauge/BatterySettingsFeatureProvider.java
View File

@@ -48,4 +48,9 @@ public interface BatterySettingsFeatureProvider {
/** Return a label for the bottom summary during wireless charging. */
@Nullable
CharSequence getWirelessChargingLabel(@NonNull Context context, @NonNull BatteryInfo info);
/** Return a remaining time label for wireless charging. */
@Nullable
CharSequence getWirelessChargingRemainingLabel(
@NonNull Context context, long remainingTimeMs, long currentTimeMs);
}

7
src/com/android/settings/fuelgauge/BatterySettingsFeatureProviderImpl.java
View File

@@ -60,4 +60,11 @@ public class BatterySettingsFeatureProviderImpl implements BatterySettingsFeatur
@NonNull Context context, @NonNull BatteryInfo info) {
return null;
}
@Nullable
@Override
public CharSequence getWirelessChargingRemainingLabel(
@NonNull Context context, long remainingTimeMs, long currentTimeMs) {
return null;
}
}