Merge "[Shadow] Switch the button for defend battery tips" into main (6bdfac7c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -83,17 +83,8 @@ public class BatteryDefenderTip extends BatteryTip {
		}

		cardPreference.setSelectable(false);
		cardPreference.setPrimaryButtonText(
		context.getString(R.string.battery_tip_charge_to_full_button));
		cardPreference.setPrimaryButtonText(context.getString(R.string.learn_more));
		cardPreference.setPrimaryButtonClickListener(
		unused -> {
		resumeCharging(context);
		preference.setVisible(false);
		});
		cardPreference.setPrimaryButtonVisible(mIsPluggedIn);

		cardPreference.setSecondaryButtonText(context.getString(R.string.learn_more));
		cardPreference.setSecondaryButtonClickListener(
		button ->
		button.startActivityForResult(
		HelpUtils.getHelpIntent(
		@@ -101,10 +92,19 @@ public class BatteryDefenderTip extends BatteryTip {
		context.getString(R.string.help_url_battery_defender),
		/* backupContext / ""), / requestCode */
		0));
		cardPreference.setSecondaryButtonVisible(true);
		cardPreference.setSecondaryButtonContentDescription(
		cardPreference.setPrimaryButtonVisible(true);
		cardPreference.setPrimaryButtonContentDescription(
		context.getString(
		R.string.battery_tip_limited_temporarily_sec_button_content_description));

		cardPreference.setSecondaryButtonText(
		context.getString(R.string.battery_tip_charge_to_full_button));
		cardPreference.setSecondaryButtonClickListener(
		unused -> {
		resumeCharging(context);
		preference.setVisible(false);
		});
		cardPreference.setSecondaryButtonVisible(mIsPluggedIn);
		}

		private void resumeCharging(Context context) {

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ public class BatteryDefenderTipTest {

		@Test
		public void updatePreference_shouldSetPrimaryButtonText() {
		String expectedText = mContext.getString(R.string.battery_tip_charge_to_full_button);
		String expectedText = mContext.getString(R.string.learn_more);

		mBatteryDefenderTip.updatePreference(mCardPreference);

		@@ -113,7 +113,7 @@ public class BatteryDefenderTipTest {

		@Test
		public void updatePreference_shouldSetSecondaryButtonText() {
		String expected = mContext.getString(R.string.learn_more);
		String expected = mContext.getString(R.string.battery_tip_charge_to_full_button);

		mBatteryDefenderTip.updatePreference(mCardPreference);

		@@ -121,10 +121,10 @@ public class BatteryDefenderTipTest {
		}

		@Test
		public void updatePreference_shouldSetSecondaryButtonVisible() {
		public void updatePreference_shouldSetPrimaryButtonVisible() {
		mBatteryDefenderTip.updatePreference(mCardPreference);

		verify(mCardPreference).setSecondaryButtonVisible(true);
		verify(mCardPreference).setPrimaryButtonVisible(true);
		}

		@Test
		@@ -138,19 +138,19 @@ public class BatteryDefenderTipTest {
		}

		@Test
		public void updatePreference_whenNotCharging_setPrimaryButtonVisibleToBeFalse() {
		public void updatePreference_whenNotCharging_setSecondaryButtonVisibleToBeFalse() {
		mBatteryDefenderTip.updatePreference(mCardPreference);

		verify(mCardPreference).setPrimaryButtonVisible(false);
		verify(mCardPreference).setSecondaryButtonVisible(false);
		}

		@Test
		public void updatePreference_whenGetChargingStatusFailed_setPrimaryButtonVisibleToBeFalse() {
		public void updatePreference_whenGetChargingStatusFailed_setSecondaryButtonVisibleToBeFalse() {
		fakeGetChargingStatusFailed();

		mBatteryDefenderTip.updatePreference(mCardPreference);

		verify(mCardPreference).setPrimaryButtonVisible(false);
		verify(mCardPreference).setSecondaryButtonVisible(false);
		}

		private void fakeGetChargingStatusFailed() {