From 105858cb31428fc7bfe7337b3eba10dd09b9b644 Mon Sep 17 00:00:00 2001
From: Pajace Chen <pajacechen@google.com>
Date: Wed, 22 May 2024 05:21:21 +0000
Subject: [PATCH] Revert^2 "Fix "Free up space" not clickable issue"

4916f22ad5a5c89c40deaf166d326337c76b418c

Test: http://ab/I09800010279460954
Test: Build Pass
Merged-In: I36062703b7ab5c21083459616234e3a86500719b
Change-Id: Ib5d46196cf5f0326c7bb1686c609be386016f73d
---
 res/xml/power_usage_summary.xml               |   2 +-
 .../BatteryTipPreferenceController.java       |   4 +-
 .../batterytip/tips/BatteryDefenderTip.java   |   5 +-
 .../fuelgauge/batterytip/tips/BatteryTip.java |  11 +-
 .../tips/IncompatibleChargerTip.java          |   3 +-
 .../settings/widget/CardPreference.java       | 164 ++++++++++
 ...CardPreference.kt => TipCardPreference.kt} |   2 +-
 ...BatteryHeaderPreferenceControllerTest.java |   1 +
 .../settings/fuelgauge/BatteryInfoTest.java   |  12 +-
 .../BatteryTipPreferenceControllerTest.java   |   6 +-
 .../tips/BatteryDefenderTipTest.java          |   8 +-
 .../batterytip/tips/BatteryTipTest.java       |   4 +-
 .../tips/IncompatibleChargerTipTest.java      |   6 +-
 .../settings/widget/CardPreferenceTest.java   | 293 ++++++++++++++++++
 ...erenceTest.kt => TipCardPreferenceTest.kt} |   8 +-
 15 files changed, 494 insertions(+), 35 deletions(-)
 create mode 100644 src/com/android/settings/widget/CardPreference.java
 rename src/com/android/settings/widget/{CardPreference.kt => TipCardPreference.kt} (99%)
 create mode 100644 tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
 rename tests/spa_unit/src/com/android/settings/widget/{CardPreferenceTest.kt => TipCardPreferenceTest.kt} (98%)

diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 1af8a8c2410..77c6b7322c2 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -33,7 +33,7 @@
         android:selectable="false"
         settings:searchable="false" />
 
-    <com.android.settings.widget.CardPreference
+    <com.android.settings.widget.TipCardPreference
         android:key="battery_tip"
         android:title="@string/summary_placeholder"
         settings:controller="com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController" />
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index 31cec6a46ba..e6f622cf00b 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -33,7 +33,7 @@ import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.CardPreference;
+import com.android.settings.widget.TipCardPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import java.util.List;
@@ -55,7 +55,7 @@ public class BatteryTipPreferenceController extends BasePreferenceController {
     private SettingsActivity mSettingsActivity;
     private MetricsFeatureProvider mMetricsFeatureProvider;
     private boolean mNeedUpdate;
-    @VisibleForTesting CardPreference mCardPreference;
+    @VisibleForTesting TipCardPreference mCardPreference;
     @VisibleForTesting Context mPrefContext;
     InstrumentedPreferenceFragment mFragment;
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
index 37162448b1b..dbe2722ebea 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
@@ -28,7 +28,6 @@ import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.CardPreference;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -80,9 +79,9 @@ public class BatteryDefenderTip extends BatteryTip {
         super.updatePreference(preference);
         final Context context = preference.getContext();
 
-        CardPreference cardPreference = castToCardPreferenceSafely(preference);
+        var cardPreference = castToTipCardPreferenceSafely(preference);
         if (cardPreference == null) {
-            Log.e(TAG, "cast Preference to CardPreference failed");
+            Log.e(TAG, "cast Preference to TipCardPreference failed");
             return;
         }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index 1d08617a421..fe98708930c 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -23,10 +23,11 @@ import android.util.SparseIntArray;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 
-import com.android.settings.widget.CardPreference;
+import com.android.settings.widget.TipCardPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import java.lang.annotation.Retention;
@@ -168,7 +169,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
         preference.setTitle(getTitle(context));
         preference.setSummary(getSummary(context));
         preference.setIcon(getIconId());
-        final CardPreference cardPreference = castToCardPreferenceSafely(preference);
+        final TipCardPreference cardPreference = castToTipCardPreferenceSafely(preference);
         if (cardPreference != null) {
             cardPreference.resetLayoutState();
         }
@@ -209,7 +210,9 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
         return "type=" + mType + " state=" + mState;
     }
 
-    public CardPreference castToCardPreferenceSafely(Preference preference) {
-        return preference instanceof CardPreference ? (CardPreference) preference : null;
+    /** Returns the converted {@link TipCardPreference} if it is valid. */
+    @Nullable
+    public TipCardPreference castToTipCardPreferenceSafely(Preference preference) {
+        return preference instanceof TipCardPreference ? (TipCardPreference) preference : null;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
index 72c710c023f..7453dedf41c 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java
@@ -26,7 +26,6 @@ import androidx.core.app.ActivityCompat;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.widget.CardPreference;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
@@ -74,7 +73,7 @@ public final class IncompatibleChargerTip extends BatteryTip {
     public void updatePreference(Preference preference) {
         super.updatePreference(preference);
         final Context context = preference.getContext();
-        final CardPreference cardPreference = castToCardPreferenceSafely(preference);
+        final var cardPreference = castToTipCardPreferenceSafely(preference);
         if (cardPreference == null) {
             Log.e(TAG, "cast Preference to CardPreference failed");
             return;
diff --git a/src/com/android/settings/widget/CardPreference.java b/src/com/android/settings/widget/CardPreference.java
new file mode 100644
index 00000000000..db6827efab8
--- /dev/null
+++ b/src/com/android/settings/widget/CardPreference.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import com.google.android.material.card.MaterialCardView;
+
+import java.util.Optional;
+
+/** Preference that wrapped by {@link MaterialCardView} */
+public class CardPreference extends Preference {
+    @Nullable private View.OnClickListener mPrimaryBtnClickListener = null;
+    @Nullable private View.OnClickListener mSecondaryBtnClickListener = null;
+    @Nullable private String mPrimaryButtonText = null;
+    @Nullable private String mSecondaryButtonText = null;
+    private Optional<Button> mPrimaryButton = Optional.empty();
+    private Optional<Button> mSecondaryButton = Optional.empty();
+    private Optional<View> mButtonsGroup = Optional.empty();
+    private boolean mPrimaryButtonVisible = false;
+    private boolean mSecondaryButtonVisible = false;
+
+    public CardPreference(Context context) {
+        this(context, null /* attrs */);
+    }
+
+    public CardPreference(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs, R.attr.cardPreferenceStyle);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        initButtonsAndLayout(holder);
+    }
+
+    private void initButtonsAndLayout(PreferenceViewHolder holder) {
+        mPrimaryButton = Optional.ofNullable((Button) holder.findViewById(android.R.id.button1));
+        mSecondaryButton = Optional.ofNullable((Button) holder.findViewById(android.R.id.button2));
+        mButtonsGroup = Optional.ofNullable(holder.findViewById(R.id.card_preference_buttons));
+        setPrimaryButtonText(mPrimaryButtonText);
+        setPrimaryButtonClickListener(mPrimaryBtnClickListener);
+        setPrimaryButtonVisible(mPrimaryButtonVisible);
+        setSecondaryButtonText(mSecondaryButtonText);
+        setSecondaryButtonClickListener(mSecondaryBtnClickListener);
+        setSecondaryButtonVisible(mSecondaryButtonVisible);
+    }
+
+    /** Clear layout state if needed */
+    public void resetLayoutState() {
+        setPrimaryButtonVisible(false);
+        setSecondaryButtonVisible(false);
+    }
+
+    /**
+     * Register a callback to be invoked when the primary button is clicked.
+     *
+     * @param l the callback that will run
+     */
+    public void setPrimaryButtonClickListener(View.OnClickListener l) {
+        mPrimaryButton.ifPresent(button -> button.setOnClickListener(l));
+        mPrimaryBtnClickListener = l;
+    }
+
+    /**
+     * Register a callback to be invoked when the secondary button is clicked.
+     *
+     * @param l the callback that will run
+     */
+    public void setSecondaryButtonClickListener(View.OnClickListener l) {
+        mSecondaryButton.ifPresent(button -> button.setOnClickListener(l));
+        mSecondaryBtnClickListener = l;
+    }
+
+    /**
+     * Sets the text to be displayed on primary button.
+     *
+     * @param text text to be displayed
+     */
+    public void setPrimaryButtonText(String text) {
+        mPrimaryButton.ifPresent(button -> button.setText(text));
+        mPrimaryButtonText = text;
+    }
+
+    /**
+     * Sets the text to be displayed on secondary button.
+     *
+     * @param text text to be displayed
+     */
+    public void setSecondaryButtonText(String text) {
+        mSecondaryButton.ifPresent(button -> button.setText(text));
+        mSecondaryButtonText = text;
+    }
+
+    /**
+     * Set the visible on the primary button.
+     *
+     * @param visible {@code true} for visible
+     */
+    public void setPrimaryButtonVisible(boolean visible) {
+        mPrimaryButton.ifPresent(
+                button -> button.setVisibility(visible ? View.VISIBLE : View.GONE));
+        mPrimaryButtonVisible = visible;
+        updateButtonGroupsVisibility();
+    }
+
+    /**
+     * Set the visible on the secondary button.
+     *
+     * @param visible {@code true} for visible
+     */
+    public void setSecondaryButtonVisible(boolean visible) {
+        mSecondaryButton.ifPresent(
+                button -> button.setVisibility(visible ? View.VISIBLE : View.GONE));
+        mSecondaryButtonVisible = visible;
+        updateButtonGroupsVisibility();
+    }
+
+    /**
+     * Sets the text of content description on primary button.
+     *
+     * @param text text for the content description
+     */
+    public void setPrimaryButtonContentDescription(String text) {
+        mPrimaryButton.ifPresent(button -> button.setContentDescription(text));
+    }
+
+    /**
+     * Sets the text of content description on secondary button.
+     *
+     * @param text text for the content description
+     */
+    public void setSecondaryButtonContentDescription(String text) {
+        mSecondaryButton.ifPresent(button -> button.setContentDescription(text));
+    }
+
+    private void updateButtonGroupsVisibility() {
+        int visibility =
+                (mPrimaryButtonVisible || mSecondaryButtonVisible) ? View.VISIBLE : View.GONE;
+        mButtonsGroup.ifPresent(group -> group.setVisibility(visibility));
+    }
+}
diff --git a/src/com/android/settings/widget/CardPreference.kt b/src/com/android/settings/widget/TipCardPreference.kt
similarity index 99%
rename from src/com/android/settings/widget/CardPreference.kt
rename to src/com/android/settings/widget/TipCardPreference.kt
index 010d7de06d1..0ae7d2a66f8 100644
--- a/src/com/android/settings/widget/CardPreference.kt
+++ b/src/com/android/settings/widget/TipCardPreference.kt
@@ -27,7 +27,7 @@ import com.android.settingslib.spa.widget.card.CardModel
 import com.android.settingslib.spa.widget.card.SettingsCard
 
 /** A preference for settings banner tips card. */
-class CardPreference
+class TipCardPreference
 @JvmOverloads
 constructor(
     context: Context,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 1b8d24e3e12..ed8f4d81432 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -35,6 +35,7 @@ import android.text.TextUtils;
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 230374a3568..c189094f235 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -551,7 +551,7 @@ public class BatteryInfoTest {
                 createIntentForGetBatteryInfoTest(
                         ChargingType.WIRED, ChargingSpeed.REGULAR, /* batteryLevel= */ 12);
         var expectedStatusLabel = "Charging";
-        var expectedRemainingLabel = "Fully charged by 2:00 PM";
+        var expectedRemainingLabel = "Fully charged by";
         var expectedChargeLabel = "12% - " + expectedRemainingLabel;
         var currentTimeMillis = Instant.parse("2024-04-01T13:00:00Z").toEpochMilli();
 
@@ -572,7 +572,7 @@ public class BatteryInfoTest {
                 createIntentForGetBatteryInfoTest(
                         ChargingType.WIRED, ChargingSpeed.SLOW, /* batteryLevel= */ 18);
         var expectedStatusLabel = "Charging";
-        var expectedRemainingLabel = "Fully charged by 3:00 PM";
+        var expectedRemainingLabel = "Fully charged by";
         var expectedChargeLabel = "18% - " + expectedRemainingLabel;
         var currentTimeMillis = Instant.parse("2024-04-01T13:00:00Z").toEpochMilli();
 
@@ -593,7 +593,7 @@ public class BatteryInfoTest {
                 createIntentForGetBatteryInfoTest(
                         ChargingType.WIRELESS, ChargingSpeed.REGULAR, /* batteryLevel= */ 45);
         var expectedStatusLabel = "Charging";
-        var expectedRemainingLabel = "Fully charged by 4:00 PM";
+        var expectedRemainingLabel = "Fully charged by";
         var expectedChargeLabel = "45% - " + expectedRemainingLabel;
         var currentTimeMillis = Instant.parse("2024-04-01T15:00:00Z").toEpochMilli();
 
@@ -614,7 +614,7 @@ public class BatteryInfoTest {
                 createIntentForGetBatteryInfoTest(
                         ChargingType.DOCKED, ChargingSpeed.REGULAR, /* batteryLevel= */ 66);
         var expectedStatusLabel = "Charging";
-        var expectedRemainingLabel = "Fully charged by 2:00 PM";
+        var expectedRemainingLabel = "Fully charged by";
         var expectedChargeLabel = "66% - " + expectedRemainingLabel;
         var currentTimeMillis = Instant.parse("2021-02-09T13:00:00.00Z").toEpochMilli();
 
@@ -685,10 +685,10 @@ public class BatteryInfoTest {
                 .isEqualTo(expectedStatusLabel);
         assertWithMessage("remainingLabel is incorrect")
                 .that(info.remainingLabel.toString())
-                .isEqualTo(expectedRemainingLabel);
+                .startsWith(expectedRemainingLabel);
         assertWithMessage("chargeLabel is incorrect")
                 .that(info.chargeLabel.toString())
-                .isEqualTo(expectedChargeLabel);
+                .startsWith(expectedChargeLabel);
     }
 
     private static Intent createBatteryIntent(int plugged, int level, int status) {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
index c05d9ed3140..4bb6695acc1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import com.android.settings.SettingsActivity;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
-import com.android.settings.widget.CardPreference;
+import com.android.settings.widget.TipCardPreference;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -61,7 +61,7 @@ public class BatteryTipPreferenceControllerTest {
     @Mock private InstrumentedPreferenceFragment mFragment;
 
     private Context mContext;
-    private CardPreference mCardPreference;
+    private TipCardPreference mCardPreference;
     private BatteryTipPreferenceController mBatteryTipPreferenceController;
     private List<BatteryTip> mNewBatteryTips;
 
@@ -69,7 +69,7 @@ public class BatteryTipPreferenceControllerTest {
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
 
-        mCardPreference = new CardPreference(mContext);
+        mCardPreference = new TipCardPreference(mContext);
         when(mPreferenceScreen.getContext()).thenReturn(mContext);
         doReturn(mCardPreference).when(mPreferenceScreen).findPreference(KEY_PREF);
 
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 a605ee32dfa..c0edb87cff1 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
@@ -29,7 +29,7 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.CardPreference;
+import com.android.settings.widget.TipCardPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
@@ -49,7 +49,7 @@ public class BatteryDefenderTipTest {
     private FakeFeatureFactory mFeatureFactory;
     private BatteryDefenderTip mBatteryDefenderTip;
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private CardPreference mCardPreference;
+    private TipCardPreference mCardPreference;
 
     @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Mock private BatteryTip mBatteryTip;
@@ -62,7 +62,7 @@ public class BatteryDefenderTipTest {
         mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
         mBatteryDefenderTip =
                 new BatteryDefenderTip(BatteryTip.StateType.NEW, /* isPluggedIn= */ false);
-        mCardPreference = new CardPreference(mContext);
+        mCardPreference = new TipCardPreference(mContext);
 
         when(mPreference.getContext()).thenReturn(mContext);
     }
@@ -98,7 +98,7 @@ public class BatteryDefenderTipTest {
     public void updatePreference_castFail_logErrorMessage() {
         mBatteryDefenderTip.updatePreference(mPreference);
 
-        assertThat(getLastErrorLog()).isEqualTo("cast Preference to CardPreference failed");
+        assertThat(getLastErrorLog()).isEqualTo("cast Preference to TipCardPreference failed");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
index 097f48406d3..77249fe9891 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
@@ -26,7 +26,7 @@ import androidx.preference.Preference;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.widget.CardPreference;
+import com.android.settings.widget.TipCardPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.testutils.DrawableTestHelper;
 
@@ -87,7 +87,7 @@ public class BatteryTipTest {
 
     @Test
     public void updatePreference_resetLayoutState() {
-        CardPreference cardPreference = new CardPreference(mContext);
+        var cardPreference = new TipCardPreference(mContext);
         cardPreference.setPrimaryButtonVisibility(true);
         cardPreference.setSecondaryButtonVisibility(true);
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
index 7a23332baf2..9b4d179179c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTipTest.java
@@ -29,7 +29,7 @@ import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.CardPreference;
+import com.android.settings.widget.TipCardPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
@@ -49,7 +49,7 @@ public final class IncompatibleChargerTipTest {
     private FakeFeatureFactory mFeatureFactory;
     private IncompatibleChargerTip mIncompatibleChargerTip;
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private CardPreference mCardPreference;
+    private TipCardPreference mCardPreference;
 
     @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule();
     @Mock private BatteryTip mBatteryTip;
@@ -61,7 +61,7 @@ public final class IncompatibleChargerTipTest {
         mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
         mContext = ApplicationProvider.getApplicationContext();
         mIncompatibleChargerTip = new IncompatibleChargerTip(BatteryTip.StateType.NEW);
-        mCardPreference = new CardPreference(mContext);
+        mCardPreference = new TipCardPreference(mContext);
 
         when(mPreference.getContext()).thenReturn(mContext);
     }
diff --git a/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
new file mode 100644
index 00000000000..76892e2d800
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/CardPreferenceTest.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *Visibility_setGoneForPrimaryButton_buttonGroupIsGone
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.widget;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class CardPreferenceTest {
+    private CardPreference mCardPreference;
+    private PreferenceViewHolder mHolder;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        context.setTheme(R.style.Theme_Settings);
+        mCardPreference = new CardPreference(context);
+        mHolder =
+                PreferenceViewHolder.createInstanceForTests(
+                        View.inflate(context, R.layout.card_preference_layout, /* parent= */ null));
+    }
+
+    @Test
+    public void newACardPreference_layoutResourceShouldBeCardPreferenceLayout() {
+        Context context = ApplicationProvider.getApplicationContext();
+        context.setTheme(R.style.SettingsPreferenceTheme);
+        CardPreference cardPreference = new CardPreference(context);
+        assertThat(cardPreference.getLayoutResource()).isEqualTo(R.layout.card_preference_layout);
+    }
+
+    @Test
+    public void onBindViewHolder_noButtonVisible_buttonsLayoutIsGone() {
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getCardPreferenceButtonsView().getVisibility()).isEqualTo(GONE);
+    }
+
+    @Test
+    public void onBindViewHolder_setPrimaryButtonVisibility_buttonsLayoutIsVisible() {
+        mCardPreference.setPrimaryButtonVisible(true);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getCardPreferenceButtonsView().getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void onBindViewHolder_setPrimaryButtonVisibilityToVisible() {
+        mCardPreference.setPrimaryButtonVisible(true);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getPrimaryButton().getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void onBindViewHolder_setSecondaryButtonVisibility_buttonsLayoutIsVisible() {
+        mCardPreference.setSecondaryButtonVisible(true);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getCardPreferenceButtonsView().getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void onBindViewHolder_setSecondaryButtonVisibilityToVisible() {
+        mCardPreference.setSecondaryButtonVisible(true);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getSecondaryButton().getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void onBindViewHolder_setPrimaryButtonTextToExpectedText() {
+        String expectedText = "primary-button";
+        mCardPreference.setPrimaryButtonText(expectedText);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getPrimaryButton().getText().toString()).isEqualTo(expectedText);
+    }
+
+    @Test
+    public void onBindViewHolder_setSecondaryButtonTextToExpectedText() {
+        String expectedText = "secondary-button";
+        mCardPreference.setSecondaryButtonText(expectedText);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getSecondaryButton().getText().toString()).isEqualTo(expectedText);
+    }
+
+    @Test
+    public void onBindViewHolder_initialTextForPrimaryButtonShouldBeEmpty() {
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getPrimaryButton().getText().toString()).isEqualTo("");
+    }
+
+    @Test
+    public void onBindViewHolder_initialTextForSecondaryButtonShouldBeEmpty() {
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getSecondaryButton().getText().toString()).isEqualTo("");
+    }
+
+    @Test
+    public void performClickOnPrimaryButton_callClickListener() {
+        final boolean[] hasCalled = {false};
+        View.OnClickListener clickListener = v -> hasCalled[0] = true;
+        mCardPreference.setPrimaryButtonClickListener(clickListener);
+        mCardPreference.onBindViewHolder(mHolder);
+        getPrimaryButton().performClick();
+        assertThat(hasCalled[0]).isTrue();
+    }
+
+    @Test
+    public void performClickOnSecondaryButton_callClickListener() {
+        final boolean[] hasCalled = {false};
+        View.OnClickListener clickListener = v -> hasCalled[0] = true;
+        mCardPreference.setSecondaryButtonClickListener(clickListener);
+        mCardPreference.onBindViewHolder(mHolder);
+        getSecondaryButton().performClick();
+        assertThat(hasCalled[0]).isTrue();
+    }
+
+    @Test
+    public void onBindViewHolder_primaryButtonDefaultIsGone() {
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getPrimaryButton().getVisibility()).isEqualTo(GONE);
+    }
+
+    @Test
+    public void onBindViewHolder_secondaryButtonDefaultIsGone() {
+        mCardPreference.onBindViewHolder(mHolder);
+        assertThat(getSecondaryButton().getVisibility()).isEqualTo(GONE);
+    }
+
+    @Test
+    public void setPrimaryButtonVisibility_setTrueAfterBindViewHolder_isVisible() {
+        mCardPreference.setPrimaryButtonVisible(false);
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setPrimaryButtonVisible(true);
+        assertThat(getPrimaryButton().getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void setPrimaryButtonText_setAfterBindViewHolder_setOnUi() {
+        String expectedText = "123456";
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setPrimaryButtonText(expectedText);
+        assertThat(getPrimaryButton().getText().toString()).isEqualTo(expectedText);
+    }
+
+    @Test
+    public void setPrimaryButtonText_setNull_isEmptyText() {
+        final String emptyString = "";
+        mCardPreference.setPrimaryButtonText("1234");
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setPrimaryButtonText(null);
+        assertThat(getPrimaryButton().getText().toString()).isEqualTo(emptyString);
+    }
+
+    @Test
+    public void setPrimaryButtonClickListener_setAfterOnBindViewHolder() {
+        final String[] hasCalled = {""};
+        String expectedClickedResult = "was called";
+        View.OnClickListener clickListener = v -> hasCalled[0] = expectedClickedResult;
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setPrimaryButtonClickListener(clickListener);
+        getPrimaryButton().performClick();
+        assertThat(hasCalled[0]).isEqualTo(expectedClickedResult);
+    }
+
+    @Test
+    public void setPrimaryButtonClickListener_setNull_clearTheOnClickListener() {
+        final String[] hasCalled = {"not called"};
+        View.OnClickListener clickListener = v -> hasCalled[0] = "called once";
+        mCardPreference.setPrimaryButtonClickListener(clickListener);
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setPrimaryButtonClickListener(null);
+        getPrimaryButton().performClick();
+        assertThat(hasCalled[0]).isEqualTo("not called");
+    }
+
+    @Test
+    public void setSecondaryButtonVisibility_setTrueAfterBindViewHolder_isVisible() {
+        mCardPreference.setSecondaryButtonVisible(false);
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setSecondaryButtonVisible(true);
+        assertThat(getSecondaryButton().getVisibility()).isEqualTo(VISIBLE);
+    }
+
+    @Test
+    public void setSecondaryButtonText_setAfterBindViewHolder_setOnUi() {
+        String expectedText = "10101010";
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setSecondaryButtonText(expectedText);
+        assertThat(getSecondaryButton().getText().toString()).isEqualTo(expectedText);
+    }
+
+    @Test
+    public void setSecondaryButtonText_setNull_isEmptyText() {
+        String emptyString = "";
+        mCardPreference.setSecondaryButtonText("1234");
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setSecondaryButtonText(null);
+        assertThat(getSecondaryButton().getText().toString()).isEqualTo(emptyString);
+    }
+
+    @Test
+    public void setSecondaryButtonClickListener_setAfterOnBindViewHolder() {
+        final String[] hasCalled = {""};
+        String expectedClickedResult = "2nd was called";
+        View.OnClickListener clickListener = v -> hasCalled[0] = expectedClickedResult;
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setSecondaryButtonClickListener(clickListener);
+        getSecondaryButton().performClick();
+        assertThat(hasCalled[0]).isEqualTo(expectedClickedResult);
+    }
+
+    @Test
+    public void setSecondaryButtonClickListener_setNull_clearTheOnClickListener() {
+        final String[] hasCalled = {"not called"};
+        View.OnClickListener clickListener = v -> hasCalled[0] = "called once";
+        mCardPreference.setSecondaryButtonClickListener(clickListener);
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.setSecondaryButtonClickListener(null);
+        getSecondaryButton().performClick();
+        assertThat(hasCalled[0]).isEqualTo("not called");
+    }
+
+    @Test
+    public void setPrimaryButtonVisibility_setGoneForSecondaryButton_buttonGroupIsGone() {
+        mCardPreference.setPrimaryButtonVisible(true);
+        mCardPreference.setSecondaryButtonVisible(false);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertWithMessage("PreCondition: buttonsView should be Visible")
+                .that(getCardPreferenceButtonsView().getVisibility())
+                .isEqualTo(VISIBLE);
+        mCardPreference.setPrimaryButtonVisible(false);
+        assertThat(getCardPreferenceButtonsView().getVisibility()).isEqualTo(GONE);
+    }
+
+    @Test
+    public void setSecondaryButtonVisibility_setGoneForPrimaryButton_buttonGroupIsGone() {
+        mCardPreference.setPrimaryButtonVisible(false);
+        mCardPreference.setSecondaryButtonVisible(true);
+        mCardPreference.onBindViewHolder(mHolder);
+        assertWithMessage("PreCondition: buttonsView should be Visible")
+                .that(getCardPreferenceButtonsView().getVisibility())
+                .isEqualTo(VISIBLE);
+        mCardPreference.setSecondaryButtonVisible(false);
+        assertThat(getCardPreferenceButtonsView().getVisibility()).isEqualTo(GONE);
+    }
+
+    @Test
+    public void resetLayoutState_buttonGroupIsGone() {
+        mCardPreference.setPrimaryButtonVisible(true);
+        mCardPreference.setSecondaryButtonVisible(true);
+        mCardPreference.onBindViewHolder(mHolder);
+        mCardPreference.resetLayoutState();
+        assertThat(getCardPreferenceButtonsView().getVisibility()).isEqualTo(GONE);
+    }
+
+    private View getCardPreferenceButtonsView() {
+        return mHolder.findViewById(R.id.card_preference_buttons);
+    }
+
+    private Button getPrimaryButton() {
+        return (Button) mHolder.findViewById(android.R.id.button1);
+    }
+
+    private Button getSecondaryButton() {
+        return (Button) mHolder.findViewById(android.R.id.button2);
+    }
+}
diff --git a/tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/widget/TipCardPreferenceTest.kt
similarity index 98%
rename from tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt
rename to tests/spa_unit/src/com/android/settings/widget/TipCardPreferenceTest.kt
index 0483e367d6e..aeea69f05e7 100644
--- a/tests/spa_unit/src/com/android/settings/widget/CardPreferenceTest.kt
+++ b/tests/spa_unit/src/com/android/settings/widget/TipCardPreferenceTest.kt
@@ -35,7 +35,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class CardPreferenceTest {
+class TipCardPreferenceTest {
 
     @get:Rule val composeTestRule = createComposeRule()
     private lateinit var context: Context
@@ -179,7 +179,7 @@ class CardPreferenceTest {
     fun resetLayoutState_shouldRemoveThePrimaryButton() {
         val buttonText = "9527"
         val cardPreference =
-            CardPreference(context)
+            TipCardPreference(context)
                 .apply {
                     primaryButtonText = buttonText
                     primaryButtonVisibility = true
@@ -196,7 +196,7 @@ class CardPreferenceTest {
     fun resetLayoutState_shouldRemoveTheSecondaryButton() {
         val buttonText = "4567"
         val cardPreference =
-            CardPreference(context)
+            TipCardPreference(context)
                 .apply {
                     secondaryButtonText = buttonText
                     secondaryButtonVisibility = true
@@ -222,7 +222,7 @@ class CardPreferenceTest {
         secondaryButtonVisibility: Boolean = false,
         enableDismiss: Boolean = true,
     ) =
-        CardPreference(context)
+        TipCardPreference(context)
             .apply {
                 this.iconResId = iconResId
                 this.primaryButtonText = primaryButtonText