Revert "[Shadow] Switch the button for defend battery tips"

This reverts commit 882058de81.

Reason for revert: Need update the test case

Change-Id: I9bb35941541408f04fb414e2b119619749e28cbf
This commit is contained in:
Pajace Chen
2024-01-02 05:21:25 +00:00
committed by Android (Google) Code Review
parent 882058de81
commit cccb5e5746

View File

@@ -83,8 +83,17 @@ public class BatteryDefenderTip extends BatteryTip {
} }
cardPreference.setSelectable(false); cardPreference.setSelectable(false);
cardPreference.setPrimaryButtonText(context.getString(R.string.learn_more)); cardPreference.setPrimaryButtonText(
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(
@@ -92,19 +101,10 @@ 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.setPrimaryButtonVisible(true); cardPreference.setSecondaryButtonVisible(true);
cardPreference.setPrimaryButtonContentDescription( cardPreference.setSecondaryButtonContentDescription(
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) {