Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2acee812 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

Merge "[Shadow] Update the string and the dismiss button" into main

parents b1ff2767 1abc13fe

res/drawable/ic_battery_defender_tip_shield.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M20,5.64L12,2L4,5.64V11.09C4,16.14 7.41,20.85 12,22C16.59,20.85 20,16.14 20,11.09V5.64Z"

      android:fillColor="?android:attr/colorAccent"/>

</vector>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5679,8 +5679,8 @@ 
    <string name="battery_tip_unrestrict_app_dialog_ok">Remove</string>

    <!-- CANCEL button for dialog to remove restriction for app [CHAR LIMIT=NONE] -->

    <string name="battery_tip_unrestrict_app_dialog_cancel">Cancel</string>

    <!-- Charge to full button for battery defender tips [CHAR LIMIT=NONE] -->

    <string name="battery_tip_charge_to_full_button">Charge to full</string>

    <!-- Override button for Battery Defender Tip to start charging  [CHAR LIMIT=NONE] -->

    <string name="battery_tip_charge_to_full_button">Override</string>

    <!-- Title of incompatible charging battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_incompatible_charging_title">Check charging accessory</string>

    <!-- Content description for the incompatible charging battery tip button [CHAR LIMIT=NONE] -->

src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class BatteryDefenderTip extends BatteryTip { 


    @Override

    public int getIconId() {

        return R.drawable.ic_battery_status_good_theme;

        return R.drawable.ic_battery_defender_tip_shield;

    }



    @Override

src/com/android/settings/fuelgauge/batterytip/tips/IncompatibleChargerTip.java

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ public final class IncompatibleChargerTip extends BatteryTip { 
        }



        cardPreference.setSelectable(false);

        cardPreference.enableDismiss(false);

        cardPreference.setIconResId(getIconId());

        cardPreference.setPrimaryButtonText(context.getString(R.string.learn_more));

        cardPreference.setPrimaryButtonAction(