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
Merged-In: I608f6b1fb9bf29a6ef5d7f9d67bcb6eea9e7aec7
This commit is contained in:
jackqdyulei
2018-02-27 14:12:32 -08:00
committed by Lei Yu
parent 2e79a7cc42
commit d0086188d2
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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,