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

[Shadow] Switch the button for defend battery tips

Browse Source 
Align the button position of defender settings tips with new design

Bug: 299403437
Test: Manual Test
Flag: None
Change-Id: I897d7291bfc21da69b661893368ddf4d6af7b06b
This commit is contained in:
Pajace Chen
2023-12-29 13:48:34 +00:00
parent da30b549be
commit 484f82e776
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
View File

@@ -83,17 +83,8 @@ public class BatteryDefenderTip extends BatteryTip {
} }
cardPreference.setSelectable(false); cardPreference.setSelectable(false);
cardPreference.setPrimaryButtonText( cardPreference.setPrimaryButtonText(context.getString(R.string.learn_more));
context.getString(R.string.battery_tip_charge_to_full_button));
cardPreference.setPrimaryButtonClickListener( cardPreference.setPrimaryButtonClickListener(
unused -> {
resumeCharging(context);
preference.setVisible(false);
});
cardPreference.setPrimaryButtonVisible(mIsPluggedIn);
cardPreference.setSecondaryButtonText(context.getString(R.string.learn_more));
cardPreference.setSecondaryButtonClickListener(
button -> button ->
button.startActivityForResult( button.startActivityForResult(
HelpUtils.getHelpIntent( HelpUtils.getHelpIntent(
@@ -101,10 +92,19 @@ public class BatteryDefenderTip extends BatteryTip {
context.getString(R.string.help_url_battery_defender), context.getString(R.string.help_url_battery_defender),
/* backupContext */ ""), /* requestCode */ /* backupContext */ ""), /* requestCode */
0)); 0));
cardPreference.setSecondaryButtonVisible(true); cardPreference.setPrimaryButtonVisible(true);
cardPreference.setSecondaryButtonContentDescription( cardPreference.setPrimaryButtonContentDescription(
context.getString( context.getString(
R.string.battery_tip_limited_temporarily_sec_button_content_description)); 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) { private void resumeCharging(Context context) {

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

@@ -104,7 +104,7 @@ public class BatteryDefenderTipTest {
@Test @Test
public void updatePreference_shouldSetPrimaryButtonText() { 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); mBatteryDefenderTip.updatePreference(mCardPreference);
@@ -113,7 +113,7 @@ public class BatteryDefenderTipTest {
@Test @Test
public void updatePreference_shouldSetSecondaryButtonText() { 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); mBatteryDefenderTip.updatePreference(mCardPreference);
@@ -121,10 +121,10 @@ public class BatteryDefenderTipTest {
} }
@Test @Test
public void updatePreference_shouldSetSecondaryButtonVisible() { public void updatePreference_shouldSetPrimaryButtonVisible() {
mBatteryDefenderTip.updatePreference(mCardPreference); mBatteryDefenderTip.updatePreference(mCardPreference);
verify(mCardPreference).setSecondaryButtonVisible(true); verify(mCardPreference).setPrimaryButtonVisible(true);
} }
@Test @Test
@@ -138,19 +138,19 @@ public class BatteryDefenderTipTest {
} }
@Test @Test
public void updatePreference_whenNotCharging_setPrimaryButtonVisibleToBeFalse() { public void updatePreference_whenNotCharging_setSecondaryButtonVisibleToBeFalse() {
mBatteryDefenderTip.updatePreference(mCardPreference); mBatteryDefenderTip.updatePreference(mCardPreference);
verify(mCardPreference).setPrimaryButtonVisible(false); verify(mCardPreference).setSecondaryButtonVisible(false);
} }
@Test @Test
public void updatePreference_whenGetChargingStatusFailed_setPrimaryButtonVisibleToBeFalse() { public void updatePreference_whenGetChargingStatusFailed_setSecondaryButtonVisibleToBeFalse() {
fakeGetChargingStatusFailed(); fakeGetChargingStatusFailed();
mBatteryDefenderTip.updatePreference(mCardPreference); mBatteryDefenderTip.updatePreference(mCardPreference);
verify(mCardPreference).setPrimaryButtonVisible(false); verify(mCardPreference).setSecondaryButtonVisible(false);
} }
private void fakeGetChargingStatusFailed() { private void fakeGetChargingStatusFailed() {