From 484f82e77635582c75cc34c21dfb9094022b32c3 Mon Sep 17 00:00:00 2001
From: Pajace Chen <pajacechen@google.com>
Date: Fri, 29 Dec 2023 13:48:34 +0000
Subject: [PATCH] [Shadow] Switch the button for defend battery tips

Align the button position of defender settings tips with new design

Bug: 299403437
Test: Manual Test
Flag: None
Change-Id: I897d7291bfc21da69b661893368ddf4d6af7b06b
---
 .../batterytip/tips/BatteryDefenderTip.java   | 24 +++++++++----------
 .../tips/BatteryDefenderTipTest.java          | 16 ++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
index b5ec522b707..047bf135741 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
@@ -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) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
index f8a4f28d79d..296306dea3e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
@@ -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() {