Merge "Add BatteryMeterView in Settings"

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 309830b,f787eb7..7b64ddf
--- 1/src/com/android/settings/fuelgauge/PowerUsageSummary.java
--- 2/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@@ -478,9 -533,14 +532,14 @@@ public class PowerUsageSummary extends 
              }
          }
  
 -        return 0;
 +        return totalPowerMah;
      }
  
+     @VisibleForTesting
+     void setBatteryLayoutPreference(LayoutPreference layoutPreference) {
+         mBatteryLayoutPref = layoutPreference;
+     }
+ 
      private static List<BatterySipper> getFakeStats() {
          ArrayList<BatterySipper> stats = new ArrayList<>();
          float use = 5;

diff --cc tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 60e1f50,1aacabd..f828238
--- 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
@@@ -57,10 -62,12 +62,13 @@@ import static org.mockito.Mockito.when
  @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
  public class PowerUsageSummaryTest {
      private static final String[] PACKAGE_NAMES = {"com.app1", "com.app2"};
+     private static final String TIME_LEFT = "2h30min";
      private static final int UID = 123;
      private static final int POWER_MAH = 100;
+     private static final int BATTERY_LEVEL_FULL = 100;
+     private static final int BATTERY_LEVEL_HALF = 50;
      private static final double BATTERY_SCREEN_USAGE = 300;
 +    private static final double BATTERY_SYSTEM_USAGE = 600;
      private static final double PRECISION = 0.001;
      private static final Intent ADDITIONAL_BATTERY_INFO_INTENT =
              new Intent("com.example.app.ADDITIONAL_BATTERY_INFO");
@@@ -80,9 -87,19 +88,21 @@@
      @Mock
      private BatterySipper mScreenBatterySipper;
      @Mock
 +    private BatterySipper mSystemBatterySipper;
 +    @Mock
      private PowerGaugePreference mPreference;
+     @Mock
+     private LayoutPreference mBatteryLayoutPref;
+     @Mock
+     private BatteryMeterView mBatteryMeterView;
+     @Mock
+     private TextView mTimeText;
+     @Mock
+     private TextView mSummary1;
+     @Mock
+     private TextView mSummary2;
+     @Mock
+     private BatteryInfo mBatteryInfo;
  
      private TestFragment mFragment;
      private FakeFeatureFactory mFeatureFactory;