Merge "Remove refresh menu icon in battery settings"

diff --cc tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 72f6a87,446e65f..dab39e4
--- 1/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
--- 2/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@@ -88,12 -77,8 +88,10 @@@ public class PowerUsageSummaryTest 
      @Mock(answer = Answers.RETURNS_DEEP_STUBS)
      private Menu mMenu;
      @Mock
-     private MenuItem mRefreshMenu;
-     @Mock
      private MenuItem mAdditionalBatteryInfoMenu;
      @Mock
 +    private MenuItem mToggleAppsMenu;
 +    @Mock
      private MenuInflater mMenuInflater;
      @Mock
      private BatterySipper mNormalBatterySipper;
@@@ -142,17 -114,10 +140,12 @@@
  
          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);
          when(mFeatureFactory.powerUsageFeatureProvider.getAdditionalBatteryInfoIntent())
                  .thenReturn(ADDITIONAL_BATTERY_INFO_INTENT);
 +        when(mBatteryHelper.getTotalPower()).thenReturn(TOTAL_POWER);
  
          mPowerUsageSummary = spy(new PowerUsageSummary());