Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b8c555 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8122a411,I947d418a,Ib90ad5af,I514918b5 

* changes:
  Move fuelgauge test package to sdk 26
  Update AnomalySummarPrefCtrl to sdk 26
  Update BackgroundActivityPrefCtrl to sdk 26
  Update BatteryHeaderPreferenceCtrlTest to sdk 26
parents 06aeaa4c a7941748

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,

        shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class})

public class AdvancedPowerUsageDetailTest {

    private static final String APP_LABEL = "app label";

tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import org.robolectric.annotation.Config; 
import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class AppButtonsPreferenceControllerTest {

    private static final String PACKAGE_NAME = "com.android.settings";

    private static final String RESOURCE_STRING = "string";

tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.widget.Button; 
import com.android.settings.R;

import com.android.settings.TestConfig;

import com.android.settings.testutils.shadow.SettingsShadowResources;

import com.android.settings.testutils.shadow.ShadowFragment;

import com.android.settings.wrapper.DevicePolicyManagerWrapper;



import org.junit.Before;
@@ -57,10 +58,11 @@ import org.robolectric.util.FragmentTestUtil; 
@RunWith(RobolectricTestRunner.class)

@Config(

        manifest = TestConfig.MANIFEST_PATH,

        sdk = TestConfig.SDK_VERSION,

        sdk = TestConfig.SDK_VERSION_O,

        shadows = {

                SettingsShadowResources.class,

                SettingsShadowResources.SettingsShadowTheme.class

                SettingsShadowResources.SettingsShadowTheme.class,

                ShadowFragment.class

        })

public class BackgroundActivityPreferenceControllerTest {

    private static final int UID_LOW_SDK = 1234;

tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class BatteryBroadcastReceiverTest {

    private static final String BATTERY_INIT_LEVEL = "100%";

    private static final String BATTERY_INIT_STATUS = "Not charging";

tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; 
import static org.mockito.Mockito.when;



@RunWith(RobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class BatteryEntryTest {



    private static final int APP_UID = 123;