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

Change current PowerUsageAdvanced to legacy code

Browse Source 
In future cl, we will create new PowerUsageAdvanced page.

Bug: 73300636
Test: Build
Change-Id: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
This commit is contained in:
jackqdyulei
2018-02-27 14:12:32 -08:00
parent d0bd7e7d46
commit 5dd5a0424f
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/power_usage_advanced.xml → res/xml/power_usage_advanced_legacy.xml
View File

@@ -17,15 +17,15 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="power_usage_advanced_screen"
android:key="power_usage_advanced_screen_legacy"
android:title="@string/advanced_battery_title"
settings:keywords="@string/keywords_battery">
<com.android.settings.fuelgauge.BatteryHistoryPreference
android:key="battery_graph"/>
android:key="battery_graph_legacy"/>
<PreferenceCategory
android:key="battery_usage_list"
android:key="battery_usage_list_legacy"
android:title="@string/battery_detail_since_full_charge"/>
</PreferenceScreen>

12
src/com/android/settings/fuelgauge/PowerUsageAdvanced.java → src/com/android/settings/fuelgauge/PowerUsageAdvancedLegacy.java
View File

@@ -42,7 +42,7 @@ import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.datausage.DataUsageUtils;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
import com.android.settings.fuelgauge.PowerUsageAdvancedLegacy.PowerUsageData.UsageType;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -57,10 +57,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class PowerUsageAdvanced extends PowerUsageBase {
public class PowerUsageAdvancedLegacy extends PowerUsageBase {
private static final String TAG = "AdvancedBatteryUsage";
private static final String KEY_BATTERY_GRAPH = "battery_graph";
private static final String KEY_BATTERY_USAGE_LIST = "battery_usage_list";
private static final String KEY_BATTERY_GRAPH = "battery_graph_legacy";
private static final String KEY_BATTERY_USAGE_LIST = "battery_usage_list_legacy";
private static final int STATUS_TYPE = BatteryStats.STATS_SINCE_CHARGED;
@VisibleForTesting
@@ -163,7 +163,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
@Override
protected int getPreferenceScreenResId() {
return R.xml.power_usage_advanced;
return R.xml.power_usage_advanced_legacy;
}
@Override
@@ -477,7 +477,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.power_usage_advanced;
sir.xmlResId = R.xml.power_usage_advanced_legacy;
return Arrays.asList(sir);
}
};

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

@@ -415,7 +415,7 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements
private void performBatteryHeaderClick() {
if (mPowerFeatureProvider.isAdvancedUiEnabled()) {
new SubSettingLauncher(getContext())
.setDestination(PowerUsageAdvanced.class.getName())
.setDestination(PowerUsageAdvancedLegacy.class.getName())
.setSourceMetricsCategory(getMetricsCategory())
.setTitle(R.string.advanced_battery_title)
.launch();

4
src/com/android/settings/search/SearchIndexableResourcesImpl.java
View File

@@ -49,8 +49,8 @@ import com.android.settings.display.NightDisplaySettings;
import com.android.settings.display.ScreenZoomSettings;
import com.android.settings.dream.DreamSettings;
import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.fuelgauge.PowerUsageAdvancedLegacy;
import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageAdvanced;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.fuelgauge.SmartBatterySettings;
import com.android.settings.gestures.AssistGestureSettings;
@@ -121,7 +121,7 @@ public class SearchIndexableResourcesImpl implements SearchIndexableResources {
addIndex(SoundSettings.class);
addIndex(ZenModeSettings.class);
addIndex(StorageSettings.class);
addIndex(PowerUsageAdvanced.class);
addIndex(PowerUsageAdvancedLegacy.class);
addIndex(DefaultAppSettings.class);
addIndex(ManageAssist.class);
addIndex(SpecialAccessSettings.class);

11
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java → tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedLegacyTest.java
View File

@@ -41,10 +41,10 @@ import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData;
import com.android.settings.fuelgauge.PowerUsageAdvanced.PowerUsageData.UsageType;
import com.android.settings.testutils.BatteryTestUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.fuelgauge.PowerUsageAdvancedLegacy.PowerUsageData;
import com.android.settings.fuelgauge.PowerUsageAdvancedLegacy.PowerUsageData.UsageType;
import org.junit.Before;
import org.junit.Test;
@@ -59,8 +59,7 @@ import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
public class PowerUsageAdvancedTest {
public class PowerUsageAdvancedLegacyTest {
private static final int FAKE_UID_1 = 50;
private static final int FAKE_UID_2 = 100;
private static final int DISCHARGE_AMOUNT = 60;
@@ -94,7 +93,7 @@ public class PowerUsageAdvancedTest {
private UserInfo mNormalUserInfo;
@Mock
private UserInfo mManagedUserInfo;
private PowerUsageAdvanced mPowerUsageAdvanced;
private PowerUsageAdvancedLegacy mPowerUsageAdvanced;
private PowerUsageData mPowerUsageData;
private Context mShadowContext;
private Intent mDischargingBatteryIntent;
@@ -103,7 +102,7 @@ public class PowerUsageAdvancedTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mShadowContext = spy(RuntimeEnvironment.application);
mPowerUsageAdvanced = spy(new PowerUsageAdvanced());
mPowerUsageAdvanced = spy(new PowerUsageAdvancedLegacy());
List<BatterySipper> batterySippers = new ArrayList<>();
batterySippers.add(new BatterySipper(DrainType.APP,