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

Commit 30a03c4e authored by Pajace Chen's avatar Pajace Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix "Free up space" not clickable issue" into main

parents 1ee693f0 e5d99fa9

res/xml/power_usage_summary.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+2 −3
Original line number Diff line number Diff line
@@ -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;

        }

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

+7 −4
Original line number Diff line number Diff line
@@ -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;
@@ -165,7 +166,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();

        }
@@ -206,7 +207,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;

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -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;