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

Commit 01eabef9 authored by Wesley Wang's avatar Wesley Wang Committed by Android (Google) Code Review
Browse files

Merge "Update battery optimize page states condition"

parents 9937a513 7e8d79b3

src/com/android/settings/fuelgauge/OptimizedPreferenceController.java

+5 −5
Original line number Diff line number Diff line
@@ -53,16 +53,16 @@ public class OptimizedPreferenceController extends AbstractPreferenceController 
            return;

        }



        if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

            Log.d(TAG, "is system or default app, disable pref");

            ((SelectorWithWidgetPreference) preference).setChecked(false);

            preference.setEnabled(false);

        } else if (mBatteryOptimizeUtils.getAppOptimizationMode()

        if (mBatteryOptimizeUtils.getAppOptimizationMode()

                == BatteryOptimizeUtils.MODE_OPTIMIZED) {

            Log.d(TAG, "is optimized states");

            ((SelectorWithWidgetPreference) preference).setChecked(true);

        } else {

            ((SelectorWithWidgetPreference) preference).setChecked(false);

            if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

                Log.d(TAG, "is system or default app, disable pref");

                preference.setEnabled(false);

            }

        }

    }

src/com/android/settings/fuelgauge/RestrictedPreferenceController.java

+5 −5
Original line number Diff line number Diff line
@@ -51,16 +51,16 @@ public class RestrictedPreferenceController extends AbstractPreferenceController 
            preference.setEnabled(true);

        }



        if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

            Log.d(TAG, "is system or default app, disable pref");

            ((SelectorWithWidgetPreference) preference).setChecked(false);

            preference.setEnabled(false);

        } else if (mBatteryOptimizeUtils.getAppOptimizationMode()

        if (mBatteryOptimizeUtils.getAppOptimizationMode()

                == BatteryOptimizeUtils.MODE_RESTRICTED) {

            Log.d(TAG, "is restricted states");

            ((SelectorWithWidgetPreference) preference).setChecked(true);

        } else {

            ((SelectorWithWidgetPreference) preference).setChecked(false);

            if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

                Log.d(TAG, "is system or default app, disable pref");

                preference.setEnabled(false);

            }

        }

    }

src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java

+5 −4
Original line number Diff line number Diff line
@@ -50,15 +50,16 @@ public class UnrestrictedPreferenceController extends AbstractPreferenceControll 
            preference.setEnabled(true);

        }



        if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

            Log.d(TAG, "is system or default app, unrestricted states only");

            ((SelectorWithWidgetPreference) preference).setChecked(true);

        } else if (mBatteryOptimizeUtils.getAppOptimizationMode()

        if (mBatteryOptimizeUtils.getAppOptimizationMode()

                == BatteryOptimizeUtils.MODE_UNRESTRICTED) {

            Log.d(TAG, "is unrestricted states");

            ((SelectorWithWidgetPreference) preference).setChecked(true);

        } else {

            ((SelectorWithWidgetPreference) preference).setChecked(false);

            if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

                Log.d(TAG, "is system or default app, disable pref");

                preference.setEnabled(false);

            }

        }

    }

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

+12 −0
Original line number Diff line number Diff line
@@ -60,6 +60,18 @@ public class OptimizedPreferenceControllerTest { 
        assertThat(mPreference.isChecked()).isTrue();

    }



    @Test

    public void testUpdateState_isSystemOrDefaultAppAndOptimizeStates_prefChecked() {

        when(mockBatteryOptimizeUtils.isValidPackageName()).thenReturn(true);

        when(mockBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);

        when(mockBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(

                BatteryOptimizeUtils.MODE_OPTIMIZED);



        mController.updateState(mPreference);



        assertThat(mPreference.isChecked()).isTrue();

    }



    @Test

    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {

        when(mockBatteryOptimizeUtils.isValidPackageName()).thenReturn(true);

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

+13 −1
Original line number Diff line number Diff line
@@ -69,7 +69,19 @@ public class RestrictedPreferenceControllerTest { 
    }



    @Test

    public void testUpdateState_isSystemOrDefaultApp_prefChecked() {

    public void testUpdateState_isSystemOrDefaultAppAndRestrictedStates_prefChecked() {

        when(mockBatteryOptimizeUtils.isValidPackageName()).thenReturn(true);

        when(mockBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);

        when(mockBatteryOptimizeUtils.getAppOptimizationMode()).thenReturn(

                BatteryOptimizeUtils.MODE_RESTRICTED);



        mController.updateState(mPreference);



        assertThat(mPreference.isChecked()).isTrue();

    }



    @Test

    public void testUpdateState_isSystemOrDefaultApp_prefUnchecked() {

        when(mockBatteryOptimizeUtils.isValidPackageName()).thenReturn(true);

        when(mockBatteryOptimizeUtils.isSystemOrDefaultApp()).thenReturn(true);