Add kill-switch to distinguish chart or non-chart design

Bug: 184807417
Bug: 180607918
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Iacbb012209d552b58b774f90f5b0aeb60ce6d33d
This commit is contained in:
ykhung
2021-04-09 11:43:22 +08:00
committed by YUKAI HUNG
parent 57f27f7a30
commit cdd73e7fec
6 changed files with 284 additions and 16 deletions

View File

@@ -36,9 +36,6 @@ import com.android.settings.dashboard.DashboardFragment;
*/
public abstract class PowerUsageBase extends DashboardFragment {
// +1 to allow ordering for PowerUsageSummary.
@VisibleForTesting
static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
private static final String TAG = "PowerUsageBase";
private static final String KEY_REFRESH_TYPE = "refresh_type";
private static final String KEY_INCLUDE_HISTORY = "include_history";
@@ -49,8 +46,8 @@ public abstract class PowerUsageBase extends DashboardFragment {
BatteryUsageStats mBatteryUsageStats;
protected UserManager mUm;
private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
protected boolean mIsBatteryPresent = true;
private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
@VisibleForTesting
final BatteryUsageStatsLoaderCallbacks mBatteryUsageStatsLoaderCallbacks =
@@ -65,7 +62,6 @@ public abstract class PowerUsageBase extends DashboardFragment {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setHasOptionsMenu(true);
mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(getContext());
mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
@@ -96,7 +92,7 @@ public abstract class PowerUsageBase extends DashboardFragment {
mBatteryUsageStatsLoaderCallbacks);
}
private void onLoadFinished(@BatteryUpdateType int refreshType) {
protected void onLoadFinished(@BatteryUpdateType int refreshType) {
refreshUi(refreshType);
}