Merge "Add feature flag for battery settings page."

This commit is contained in:
TreeHugger Robot
2017-12-05 22:53:42 +00:00
committed by Android (Google) Code Review
12 changed files with 1038 additions and 12 deletions

View File

@@ -4,6 +4,7 @@ com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
com.android.settings.bluetooth.BluetoothPairingDetail
com.android.settings.accounts.AccountDetailDashboardFragment
com.android.settings.fuelgauge.PowerUsageAnomalyDetails
com.android.settings.fuelgauge.PowerUsageSummaryLegacy
com.android.settings.fuelgauge.AdvancedPowerUsageDetail
com.android.settings.development.featureflags.FeatureFlagsDashboard
com.android.settings.development.qstile.DevelopmentTileConfigFragment

View File

@@ -91,7 +91,7 @@ import java.util.List;
SettingsShadowResources.class,
SettingsShadowResources.SettingsShadowTheme.class,
})
public class PowerUsageSummaryTest {
public class PowerUsageSummaryLegacyTest {
private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
private static final String STUB_STRING = "stub_string";
private static final int UID = 123;
@@ -542,7 +542,7 @@ public class PowerUsageSummaryTest {
verify(mBatteryHeaderPreferenceController, never()).quickUpdateHeaderPreference();
}
public static class TestFragment extends PowerUsageSummary {
public static class TestFragment extends PowerUsageSummaryLegacy {
private Context mContext;
private boolean mStartActivityCalled;