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

Commit 06e92f5e authored by YK Hung's avatar YK Hung Committed by Automerger Merge Worker
Browse files

Merge "Update defend tips card" into tm-qpr-dev am: 8bf87233 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764101



Change-Id: I6c4d4d551dc4ccd1897422cd65bf26cadeb9994c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b151b094 8bf87233

res/layout/card_preference.xml

+15 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
    android:clipToPadding="false"

    android:baselineAligned="false">



    <include layout="@layout/card_preference_icon_frame"/>



    <RelativeLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"
@@ -36,10 +34,22 @@ 
        android:paddingTop="16dp"

        android:paddingBottom="16dp">



        <LinearLayout

            android:id="@+id/card_preference_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignTop="@android:id/title"

            android:layout_alignBottom="@android:id/summary"

            android:gravity="center_vertical">



            <include layout="@layout/card_preference_icon_frame"/>

        </LinearLayout>



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toEndOf="@+id/card_preference_parent"

            android:maxLines="2"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"/>
@@ -61,7 +71,7 @@ 
            android:id="@+id/card_preference_buttons"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:layout_marginTop="24dp"

            android:layout_below="@android:id/summary"

            android:visibility="gone">

            <Button
@@ -69,7 +79,7 @@ 
                style="@style/CardPreferencePrimaryButton"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_marginHorizontal="4dp"

                android:layout_marginStart="20dp"

                android:layout_toStartOf="@android:id/button2"

                android:visibility="gone"/>

            <Button
@@ -77,7 +87,7 @@ 
                style="@style/CardPreferenceBorderlessButton"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:layout_marginHorizontal="4dp"

                android:layout_marginHorizontal="20dp"

                android:layout_alignParentEnd="true"

                android:visibility="gone"/>

        </RelativeLayout>

res/layout/card_preference_layout.xml

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
    android:id="@+id/container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="8dp"

    android:layout_marginVertical="8dp"

    android:layout_marginStart="24dp"

    android:layout_marginEnd="16dp"

    android:foreground="@drawable/contextual_card_background"

    android:clickable="true"

    style="@style/ContextualCardStyle">

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -6411,9 +6411,11 @@ 
    <!-- Title for the battery limited temporarily tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_title">Charging is paused</string>

    <!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_summary">Protecting battery to extend battery lifespan\nTap to learn more</string>

    <string name="battery_tip_limited_temporarily_summary">Protecting battery to extend battery lifespan</string>

    <!-- Summary for the battery limited temporarily extra tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_extra_summary"><xliff:g id="percent" example="10%">%1$s</xliff:g></string>

    <!-- Content description for the battery limited temporarily tip secondary button [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_sec_button_content_description">Learn more about charging is paused</string>

    <!-- Text of battery limited temporarily tip resume charge button. [CHAR LIMIT=NONE] -->

    <string name="battery_tip_limited_temporarily_dialog_resume_charge">Resume charging</string>

    <!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->

res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ 
        <item name="android:textSize">14sp</item>

        <item name="android:textAllCaps">false</item>

        <item name="android:singleLine">true</item>

        <item name="android:paddingHorizontal">24dp</item>

    </style>



    <style name="CardPreferenceBorderlessButton"

src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import androidx.annotation.NonNull; 
import com.android.internal.util.CollectionUtils;

import com.android.settings.SettingsActivity;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.fuelgauge.batterytip.actions.BatteryDefenderAction;

import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;

import com.android.settings.fuelgauge.batterytip.actions.OpenBatterySaverAction;

import com.android.settings.fuelgauge.batterytip.actions.OpenRestrictAppFragmentAction;
@@ -107,8 +106,6 @@ public class BatteryTipUtils { 
                }

            case BatteryTip.TipType.REMOVE_APP_RESTRICTION:

                return new UnrestrictAppAction(settingsActivity, (UnrestrictAppTip) batteryTip);

            case BatteryTip.TipType.BATTERY_DEFENDER:

                return new BatteryDefenderAction(settingsActivity);

            default:

                return null;

        }