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

Commit 82c108ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove refresh menu icon in battery settings"

parents 7b8c9b92 9d5412f9

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

+0 −21
Original line number Diff line number Diff line
@@ -101,27 +101,6 @@ public abstract class PowerUsageBase extends DashboardFragment { 
        }

    }



    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        super.onCreateOptionsMenu(menu, inflater);

        MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)

                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)

                .setAlphabeticShortcut('r');

        refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |

                MenuItem.SHOW_AS_ACTION_WITH_TEXT);

    }



    public boolean onOptionsItemSelected(MenuItem item) {

        switch (item.getItemId()) {

            case MENU_STATS_REFRESH:

                mStatsHelper.clearStats();

                refreshStats();

                mHandler.removeMessages(MSG_REFRESH_STATS);

                return true;

        }

        return super.onOptionsItemSelected(item);

    }



    protected void refreshStats() {

        mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUm.getUserProfiles());

    }

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

+0 −7
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ public class PowerUsageSummaryTest { 
    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private Menu mMenu;

    @Mock

    private MenuItem mRefreshMenu;

    @Mock

    private MenuItem mAdditionalBatteryInfoMenu;

    @Mock

    private MenuItem mToggleAppsMenu;
@@ -142,11 +140,6 @@ public class PowerUsageSummaryTest { 


        mFragment = new TestFragment(mContext);



        when(mMenu.add(Menu.NONE, MENU_STATS_REFRESH, Menu.NONE,

                R.string.menu_stats_refresh)

                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)

                .setAlphabeticShortcut('r'))

                .thenReturn(mRefreshMenu);

        when(mAdditionalBatteryInfoMenu.getItemId())

                .thenReturn(MENU_ADDITIONAL_BATTERY_INFO);

        when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);