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

Commit 166102c3 authored by jackqdyulei's avatar jackqdyulei
Browse files

Add feature flag for battery settings page. 

Create PowerUsageSummaryLegacy and power_usage_summary_legacy, which
contains the old implementaion.

Bug: 69797586
Test: RunSettingsRoboTests
Change-Id: Icb9c25f06889462a6eedea48ae166043a6636848
parent 82789a1f

AndroidManifest.xml

+25 −7
Original line number Diff line number Diff line
@@ -2213,16 +2213,13 @@ 
        <activity android:name="Settings$PowerUsageSummaryActivity"

                android:label="@string/power_usage_summary_title"

                android:icon="@drawable/ic_settings_battery"

                android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

                android:enabled="false">

            <!-- TODO(b/69867246): add priority for this intent-filter -->

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <!-- TODO(b/69867246): add shortcut intent-filter  -->

            <intent-filter android:priority="8">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>
@@ -2241,6 +2238,27 @@ 
                android:value="com.android.settings.fuelgauge.PowerUsageSummary" />

        </activity-alias>



        <activity android:name=".Settings$PowerUsageSummaryLegacyActivity"

                  android:label="@string/power_usage_summary_title"

                  android:icon="@drawable/ic_settings_battery">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="8">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.homepage" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.fuelgauge.PowerUsageSummaryLegacy" />

        </activity>



        <activity android:name="Settings$BatterySaverSettingsActivity"

                android:label="@string/battery_saver"

                android:icon="@drawable/ic_settings_battery"

res/xml/power_usage_summary_legacy.xml

0 → 100644
+90 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2009 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="power_usage_summary_screen"

    android:title="@string/power_usage_summary_title"

    settings:keywords="@string/keywords_battery">



    <com.android.settings.applications.LayoutPreference

        android:key="battery_header"

        android:selectable="true"

        android:layout="@layout/battery_header"/>



    <Preference

        android:key="high_usage"

        android:icon="@drawable/ic_battery_alert_24dp"

        android:title="@string/power_high_usage_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">



        <com.android.settings.widget.MasterSwitchPreference

            android:fragment="com.android.settings.fuelgauge.BatterySaverSettings"

            android:key="battery_saver_summary"

            android:title="@string/battery_saver"/>



        <SwitchPreference

            android:key="battery_percentage"

            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="app_list"

        android:title="@string/power_usage_list_summary"/>



</PreferenceScreen>

src/com/android/settings/Settings.java

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.settings;



import static com.android.settings.core.FeatureFlags.BATTERY_SETTINGS_V2;

import static com.android.settings.core.FeatureFlags.CONNECTED_DEVICE_V2;



import android.os.Bundle;
@@ -72,7 +73,6 @@ public class Settings extends SettingsActivity { 
    public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }

    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }

    public static class RunningServicesActivity extends SettingsActivity { /* empty */ }

    public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class BatterySaverSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccountSyncSettingsInAddAccountActivity extends SettingsActivity { /* empty */ }
@@ -174,6 +174,8 @@ public class Settings extends SettingsActivity { 
        }

    }

    public static class ConnectedDeviceDashboardActivityOld extends SettingsActivity {}

    public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }

    public static class PowerUsageSummaryLegacyActivity extends SettingsActivity { /* empty */ }

    public static class AppAndNotificationDashboardActivity extends SettingsActivity {}

    public static class StorageDashboardActivity extends SettingsActivity {}

    public static class UserAndAccountDashboardActivity extends SettingsActivity {}

src/com/android/settings/SettingsActivity.java

+9 −1
Original line number Diff line number Diff line
@@ -810,9 +810,17 @@ public class SettingsActivity extends SettingsDrawerActivity 
                Utils.showSimCardTile(this), isAdmin)

                || somethingChanged;



        final boolean isBatterySettingsV2Enabled = FeatureFactory.getFactory(this)

                .getPowerUsageFeatureProvider(this)

                .isBatteryV2Enabled();

        // Enable new battery page if v2 enabled

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.PowerUsageSummaryActivity.class.getName()),

                mBatteryPresent, isAdmin) || somethingChanged;

                mBatteryPresent && isBatterySettingsV2Enabled, isAdmin) || somethingChanged;

        // Enable legacy battery page if v2 disabled

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.PowerUsageSummaryLegacyActivity.class.getName()),

                mBatteryPresent && !isBatterySettingsV2Enabled, isAdmin) || somethingChanged;



        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.UserSettingsActivity.class.getName()),

src/com/android/settings/core/FeatureFlags.java

+1 −0
Original line number Diff line number Diff line
@@ -25,4 +25,5 @@ public class FeatureFlags { 
    public static final String SUGGESTIONS_V2 = "new_settings_suggestion";

    public static final String APP_INFO_V2 = "settings_app_info_v2";

    public static final String CONNECTED_DEVICE_V2 = "settings_connected_device_v2";

    public static final String BATTERY_SETTINGS_V2 = "settings_battery_v2";

}