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

Commit 094278e6 authored by jackqdyulei's avatar jackqdyulei Committed by Lei Yu
Browse files

Hook up the new page to PowerUsageSummary 

Add a menu to point to the new page

Bug: 73300636
Test: RunSettingsRoboTests
Change-Id: I9956e349cdbbe2cd752bdf65020a540a329bdee3
Merged-In: I9956e349cdbbe2cd752bdf65020a540a329bdee3
parent 31a59604

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

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.graphics.drawable.Drawable;

import android.os.BatteryStats;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Process;

import android.os.UserHandle;
@@ -81,7 +82,7 @@ public class BatteryAppListPreferenceController extends AbstractPreferenceContro 
    private Context mPrefContext;

    SparseArray<List<Anomaly>> mAnomalySparseArray;



    private Handler mHandler = new Handler() {

    private Handler mHandler = new Handler(Looper.getMainLooper()) {

        @Override

        public void handleMessage(Message msg) {

            switch (msg.what) {

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

+10 −0
Original line number Diff line number Diff line
@@ -171,6 +171,16 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
                    sir.xmlResId = R.xml.power_usage_advanced;

                    return Arrays.asList(sir);

                }



                @Override

                public List<AbstractPreferenceController> createPreferenceControllers(

                        Context context) {

                    final List<AbstractPreferenceController> controllers = new ArrayList<>();

                    controllers.add(new BatteryAppListPreferenceController(context,

                            KEY_APP_LIST, null /* lifecycle */, null /* activity */,

                            null /* fragment */));

                    return controllers;

                }

            };



}

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

+14 −8
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.settings.R; 
import com.android.settings.SettingsActivity;

import com.android.settings.Utils;

import com.android.settings.applications.LayoutPreference;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.display.BatteryPercentagePreferenceController;

import com.android.settings.fuelgauge.anomaly.Anomaly;
@@ -49,7 +50,6 @@ import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.utils.PowerUtil;

import com.android.settingslib.utils.StringUtil;
@@ -68,7 +68,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
    static final String TAG = "PowerUsageSummary";



    private static final boolean DEBUG = false;

    private static final String KEY_APP_LIST = "app_list";

    private static final String KEY_BATTERY_HEADER = "battery_header";

    private static final String KEY_BATTERY_TIP = "battery_tip";
@@ -80,7 +79,10 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
    static final int BATTERY_INFO_LOADER = 1;

    @VisibleForTesting

    static final int BATTERY_TIP_LOADER = 2;

    private static final int MENU_STATS_TYPE = Menu.FIRST;

    @VisibleForTesting

    static final int MENU_STATS_TYPE = Menu.FIRST;

    @VisibleForTesting

    static final int MENU_ADVANCED_BATTERY = Menu.FIRST + 1;

    public static final int DEBUG_INFO_LOADER = 3;



    @VisibleForTesting
@@ -246,6 +248,8 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                    .setAlphabeticShortcut('t');

        }



        menu.add(Menu.NONE, MENU_ADVANCED_BATTERY, Menu.NONE, R.string.advanced_battery_title);



        super.onCreateOptionsMenu(menu, inflater);

    }
@@ -256,11 +260,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 


    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        final SettingsActivity sa = (SettingsActivity) getActivity();

        final Context context = getContext();

        final MetricsFeatureProvider metricsFeatureProvider =

                FeatureFactory.getFactory(context).getMetricsFeatureProvider();



        switch (item.getItemId()) {

            case MENU_STATS_TYPE:

                if (mStatsType == BatteryStats.STATS_SINCE_CHARGED) {
@@ -270,6 +269,13 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                }

                refreshUi();

                return true;

            case MENU_ADVANCED_BATTERY:

                new SubSettingLauncher(getContext())

                        .setDestination(PowerUsageAdvanced.class.getName())

                        .setSourceMetricsCategory(getMetricsCategory())

                        .setTitle(R.string.advanced_battery_title)

                        .launch();

                return true;

            default:

                return super.onOptionsItemSelected(item);

        }

src/com/android/settings/search/SearchIndexableResourcesImpl.java

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.android.settings.display.NightDisplaySettings; 
import com.android.settings.display.ScreenZoomSettings;

import com.android.settings.dream.DreamSettings;

import com.android.settings.enterprise.EnterprisePrivacySettings;

import com.android.settings.fuelgauge.PowerUsageAdvanced;

import com.android.settings.fuelgauge.PowerUsageAdvancedLegacy;

import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;

import com.android.settings.fuelgauge.PowerUsageSummary;
@@ -121,6 +122,7 @@ public class SearchIndexableResourcesImpl implements SearchIndexableResources { 
        addIndex(SoundSettings.class);

        addIndex(ZenModeSettings.class);

        addIndex(StorageSettings.class);

        addIndex(PowerUsageAdvanced.class);

        addIndex(PowerUsageAdvancedLegacy.class);

        addIndex(DefaultAppSettings.class);

        addIndex(ManageAssist.class);

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

+0 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.view.MenuItem; 


import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.TestConfig;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -45,10 +44,8 @@ import org.mockito.Answers; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(SettingsRobolectricTestRunner.class)

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

public class PowerUsageAdvancedTest {

    @Mock

    private PreferenceScreen mPreferenceScreen;