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

Commit 25fc8e45 authored by jackqdyulei's avatar jackqdyulei
Browse files

Remove the battery optimization menu 

Change-Id: I129f2c39dba506dabef2cf543e71f70cfd1e7fdf
Fixes: 73189468
Test: Test still pass
parent 4f6d667a

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

+0 −14
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
    @VisibleForTesting

    static final int BATTERY_TIP_LOADER = 2;

    private static final int MENU_STATS_TYPE = Menu.FIRST;

    @VisibleForTesting

    static final int MENU_HIGH_POWER_APPS = Menu.FIRST + 3;

    private static final int MENU_HELP = Menu.FIRST + 5;

    public static final int DEBUG_INFO_LOADER = 3;



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

        }



        menu.add(Menu.NONE, MENU_HIGH_POWER_APPS, Menu.NONE, R.string.high_power_apps);



        super.onCreateOptionsMenu(menu, inflater);

    }
@@ -283,15 +278,6 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList 
                }

                refreshUi();

                return true;

            case MENU_HIGH_POWER_APPS:

                Bundle args = new Bundle();

                args.putString(ManageApplications.EXTRA_CLASSNAME,

                        HighPowerApplicationsActivity.class.getName());

                sa.startPreferencePanel(this, ManageApplications.class.getName(), args,

                        R.string.high_power_apps, null, null, 0);

                metricsFeatureProvider.action(context,

                        MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);

                return true;

            default:

                return super.onOptionsItemSelected(item);

        }

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

+0 −19
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.settings.fuelgauge;



import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Matchers.any;
@@ -108,14 +106,6 @@ public class PowerUsageSummaryTest { 


    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private Context mContext;

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private Menu mMenu;

    @Mock

    private MenuItem mToggleAppsMenu;

    @Mock

    private MenuItem mHighPowerMenu;

    @Mock

    private MenuInflater mMenuInflater;

    @Mock

    private BatterySipper mNormalBatterySipper;

    @Mock
@@ -169,7 +159,6 @@ public class PowerUsageSummaryTest { 
        doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();



        when(mFragment.getActivity()).thenReturn(mSettingsActivity);

        when(mHighPowerMenu.getItemId()).thenReturn(MENU_HIGH_POWER_APPS);

        when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())

                .thenReturn(sAdditionalBatteryInfoIntent);

        when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
@@ -204,14 +193,6 @@ public class PowerUsageSummaryTest { 
        mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));

    }



    @Test

    public void testOptionsMenu_menuHighPower_metricEventInvoked() {

        mFragment.onOptionsItemSelected(mHighPowerMenu);



        verify(mFeatureFactory.metricsFeatureProvider).action(mContext,

                MetricsProto.MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_OPTIMIZATION);

    }



    @Test

    public void testUpdateLastFullChargePreference_showCorrectSummary() {

        doReturn(mRealContext).when(mFragment).getContext();