From cccb5e57469a19434048ddddd6812ba8b3972503 Mon Sep 17 00:00:00 2001 From: Pajace Chen Date: Tue, 2 Jan 2024 05:21:25 +0000 Subject: [PATCH] Revert "[Shadow] Switch the button for defend battery tips" This reverts commit 882058de81261a6b890c450d1acf9c6f75d73e4f. Reason for revert: Need update the test case Change-Id: I9bb35941541408f04fb414e2b119619749e28cbf --- .../batterytip/tips/BatteryDefenderTip.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java index 047bf135741..b5ec522b707 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java @@ -83,8 +83,17 @@ public class BatteryDefenderTip extends BatteryTip { } 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( + unused -> { + resumeCharging(context); + preference.setVisible(false); + }); + cardPreference.setPrimaryButtonVisible(mIsPluggedIn); + + cardPreference.setSecondaryButtonText(context.getString(R.string.learn_more)); + cardPreference.setSecondaryButtonClickListener( button -> button.startActivityForResult( HelpUtils.getHelpIntent( @@ -92,19 +101,10 @@ public class BatteryDefenderTip extends BatteryTip { context.getString(R.string.help_url_battery_defender), /* backupContext */ ""), /* requestCode */ 0)); - cardPreference.setPrimaryButtonVisible(true); - cardPreference.setPrimaryButtonContentDescription( + cardPreference.setSecondaryButtonVisible(true); + cardPreference.setSecondaryButtonContentDescription( 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) {