Merge "Fix battery robo test" into qt-dev (fc481186) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ public class BatteryMeterView extends ImageView {
		}

		public int getBatteryLevel() {
		return mDrawable.getLevel();
		return mDrawable.getBatteryLevel();
		}

		public void setCharging(boolean charging) {

+0 −3

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import com.android.settingslib.widget.LayoutPreference;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -136,7 +135,6 @@ public class BatteryHeaderPreferenceControllerTest {
		}

		@Test
		@Ignore("b/130896701")
		public void displayPreference_displayBatteryLevel() {
		mController.displayPreference(mPreferenceScreen);

		@@ -190,7 +188,6 @@ public class BatteryHeaderPreferenceControllerTest {
		}

		@Test
		@Ignore("b/130896701")
		public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
		mSummary.setText(BATTERY_STATUS);
		mSummary2.setText(BATTERY_STATUS);