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

Add incompatible charging battery tip UI and card skeleton

Browse Source 
Bug: 263193978
Bug: 246960554
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.batterytip"
Change-Id: I8180022bd39f66c88463a2552c6050669bb0357c
This commit is contained in:
ykhung
2023-02-05 20:17:00 +08:00
committed by YK Hung
parent 2593fcd1bf
commit c6d34d6c58
7 changed files with 266 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
View File

@@ -27,6 +27,7 @@ import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.widget.CardPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.lang.annotation.Retention;
@@ -59,7 +60,8 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
TipType.LOW_BATTERY,
TipType.REMOVE_APP_RESTRICTION,
TipType.BATTERY_DEFENDER,
TipType.DOCK_DEFENDER})
TipType.DOCK_DEFENDER,
TipType.INCOMPATIBLE_CHARGER})
public @interface TipType {
int SMART_BATTERY_MANAGER = 0;
int APP_RESTRICTION = 1;
@@ -71,6 +73,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
int REMOVE_APP_RESTRICTION = 7;
int BATTERY_DEFENDER = 8;
int DOCK_DEFENDER = 9;
int INCOMPATIBLE_CHARGER = 10;
}
@VisibleForTesting
@@ -81,12 +84,13 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
TIP_ORDER.append(TipType.LOW_BATTERY, 1);
TIP_ORDER.append(TipType.BATTERY_DEFENDER, 2);
TIP_ORDER.append(TipType.DOCK_DEFENDER, 3);
TIP_ORDER.append(TipType.APP_RESTRICTION, 4);
TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 5);
TIP_ORDER.append(TipType.SUMMARY, 6);
TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 7);
TIP_ORDER.append(TipType.REDUCED_BATTERY, 8);
TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 9);
TIP_ORDER.append(TipType.INCOMPATIBLE_CHARGER, 4);
TIP_ORDER.append(TipType.APP_RESTRICTION, 5);
TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 6);
TIP_ORDER.append(TipType.SUMMARY, 7);
TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 8);
TIP_ORDER.append(TipType.REDUCED_BATTERY, 9);
TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 10);
}
private static final String KEY_PREFIX = "key_battery_tip";
@@ -203,4 +207,8 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
public String toString() {
return "type=" + mType + " state=" + mState;
}
CardPreference castToCardPreferenceSafely(Preference preference) {
return preference instanceof CardPreference ? (CardPreference) preference : null;
}
}