PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove refresh menu icon in battery settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-23 02:37:51 +00:00
committed by Android (Google) Code Review
parent 7b8c9b92f1 9d5412f9ea
commit 82c108ab32
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/fuelgauge/PowerUsageBase.java
View File

@@ -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() { protected void refreshStats() {
mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUm.getUserProfiles()); mStatsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUm.getUserProfiles());
} }

7
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -88,8 +88,6 @@ public class PowerUsageSummaryTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Menu mMenu; private Menu mMenu;
@Mock @Mock
private MenuItem mRefreshMenu;
@Mock
private MenuItem mAdditionalBatteryInfoMenu; private MenuItem mAdditionalBatteryInfoMenu;
@Mock @Mock
private MenuItem mToggleAppsMenu; private MenuItem mToggleAppsMenu;
@@ -142,11 +140,6 @@ public class PowerUsageSummaryTest {
mFragment = new TestFragment(mContext); 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()) when(mAdditionalBatteryInfoMenu.getItemId())
.thenReturn(MENU_ADDITIONAL_BATTERY_INFO); .thenReturn(MENU_ADDITIONAL_BATTERY_INFO);
when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS); when(mToggleAppsMenu.getItemId()).thenReturn(MENU_TOGGLE_APPS);