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

Commit 5c56588d authored by jackqdyulei's avatar jackqdyulei
Browse files

Remove toggles in battery settings. 

In Android P, we only show "Battery saver" and "Power management"
in battery settings. So we need to remove other preferences.

Keep "Battery percentage" toggle for now because it is not
cross-listed in other places.

Bug: 71502850
Test: Screenshot
Change-Id: Ia3c919f61239ff71f9343f2bce961aa4b89533c0
parent ce3633be

res/xml/power_usage_summary.xml

+15 −37
Original line number Diff line number Diff line
@@ -31,23 +31,7 @@ 
        android:layout="@layout/preference_category_no_title"/>



    <PreferenceCategory

        android:key="device_usage_list">



        <com.android.settings.fuelgauge.PowerGaugePreference

            android:key="last_full_charge"

            android:title="@string/battery_last_full_charge"

            android:selectable="false"/>



        <com.android.settings.fuelgauge.PowerGaugePreference

            android:key="screen_usage"

            android:title="@string/device_screen_usage"

            android:selectable="false"/>



    </PreferenceCategory>



    <PreferenceCategory

        android:key="power_management"

        android:title="@string/battery_power_management">

        android:key="power_management">



        <com.android.settings.widget.MasterSwitchPreference

            android:fragment="com.android.settings.fuelgauge.BatterySaverSettings"
@@ -59,26 +43,20 @@ 
            android:title="@string/battery_percentage"

            android:summary="@string/battery_percentage_description"/>



        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <SwitchPreference

            android:key="auto_brightness_battery"

            android:title="@string/auto_brightness_title"

            android:summary="@string/auto_brightness_summary"

            settings:keywords="@string/keywords_display_auto_brightness"/>



        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <com.android.settings.TimeoutListPreference

            android:key="screen_timeout_battery"

            android:title="@string/screen_timeout"

            android:summary="@string/screen_timeout_summary"

            android:entries="@array/screen_timeout_entries"

            android:entryValues="@array/screen_timeout_values"/>



        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->

        <Preference

            android:key="ambient_display_battery"

            android:title="@string/ambient_display_screen_title"

            android:fragment="com.android.settings.display.AmbientDisplaySettings" />

    </PreferenceCategory>



    <PreferenceCategory

        android:key="device_usage_list">



        <com.android.settings.fuelgauge.PowerGaugePreference

            android:key="last_full_charge"

            android:title="@string/battery_last_full_charge"

            android:selectable="false"/>



        <com.android.settings.fuelgauge.PowerGaugePreference

            android:key="screen_usage"

            android:title="@string/device_screen_usage"

            android:selectable="false"/>



    </PreferenceCategory>

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

+1 −14
Original line number Diff line number Diff line
@@ -84,10 +84,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 


    private static final String KEY_SCREEN_USAGE = "screen_usage";

    private static final String KEY_TIME_SINCE_LAST_FULL_CHARGE = "last_full_charge";



    private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness_battery";

    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout_battery";

    private static final String KEY_AMBIENT_DISPLAY = "ambient_display_battery";

    private static final String KEY_BATTERY_SAVER_SUMMARY = "battery_saver_summary";



    @VisibleForTesting
@@ -272,14 +268,9 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
        mBatteryTipPreferenceController = new BatteryTipPreferenceController(context,

                KEY_BATTERY_TIP, this);

        controllers.add(mBatteryTipPreferenceController);

        controllers.add(new AutoBrightnessPreferenceController(context, KEY_AUTO_BRIGHTNESS));

        controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));

        controllers.add(new BatterySaverController(context, getLifecycle()));

        controllers.add(new BatteryPercentagePreferenceController(context));

        controllers.add(new AmbientDisplayPreferenceController(

                context,

                new AmbientDisplayConfiguration(context),

                KEY_AMBIENT_DISPLAY));



        return controllers;

    }
@@ -544,10 +535,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                public List<String> getNonIndexableKeys(Context context) {

                    List<String> niks = super.getNonIndexableKeys(context);

                    niks.add(KEY_BATTERY_SAVER_SUMMARY);

                    // Duplicates in display

                    niks.add(KEY_AUTO_BRIGHTNESS);

                    niks.add(KEY_SCREEN_TIMEOUT);

                    niks.add(KEY_AMBIENT_DISPLAY);

                    return niks;

                }

            };

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

+0 −12
Original line number Diff line number Diff line
@@ -400,18 +400,6 @@ public class PowerUsageSummaryLegacyTest { 
        assertThat(percent).isWithin(PRECISION).of(POWER_USAGE_PERCENTAGE);

    }



    @Test

    public void testNonIndexableKeys_MatchPreferenceKeys() {

        final Context context = RuntimeEnvironment.application;

        final List<String> niks = PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER

                .getNonIndexableKeys(context);



        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context,

                R.xml.power_usage_summary);



        assertThat(keys).containsAllIn(niks);

    }



    @Test

    public void testPreferenceControllers_getPreferenceKeys_existInPreferenceScreen() {

        final Context context = RuntimeEnvironment.application;