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

Commit 4916f22a authored by Satish Yalla's avatar Satish Yalla Committed by Android (Google) Code Review
Browse files

Revert "Fix "Free up space" not clickable issue" 

Revert submission 27450348-cherrypicker-L62500030004014460:N91700030063291466

Reason for revert: Droidmonitor triggered revert due to build breakage in b/342043629. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:27450348-cherrypicker-L62500030004014460:N91700030063291466

Change-Id: Ifaf5fbee7f18719e89d5278585ae80bed3808bb5
parent 567f0460

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.TipCardPreference

    <com.android.settings.widget.CardPreference

        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.TipCardPreference;

import com.android.settings.widget.CardPreference;

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 TipCardPreference mCardPreference;

    @VisibleForTesting CardPreference mCardPreference;

    @VisibleForTesting Context mPrefContext;

    InstrumentedPreferenceFragment mFragment;

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

+3 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 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;
@@ -79,9 +80,9 @@ public class BatteryDefenderTip extends BatteryTip { 
        super.updatePreference(preference);

        final Context context = preference.getContext();



        var cardPreference = castToTipCardPreferenceSafely(preference);

        CardPreference cardPreference = castToCardPreferenceSafely(preference);

        if (cardPreference == null) {

            Log.e(TAG, "cast Preference to TipCardPreference failed");

            Log.e(TAG, "cast Preference to CardPreference failed");

            return;

        }

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

+4 −7
Original line number Diff line number Diff line
@@ -23,11 +23,10 @@ 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.TipCardPreference;

import com.android.settings.widget.CardPreference;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;



import java.lang.annotation.Retention;
@@ -169,7 +168,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        preference.setTitle(getTitle(context));

        preference.setSummary(getSummary(context));

        preference.setIcon(getIconId());

        final TipCardPreference cardPreference = castToTipCardPreferenceSafely(preference);

        final CardPreference cardPreference = castToCardPreferenceSafely(preference);

        if (cardPreference != null) {

            cardPreference.resetLayoutState();

        }
@@ -210,9 +209,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { 
        return "type=" + mType + " state=" + mState;

    }



    /** Returns the converted {@link TipCardPreference} if it is valid. */

    @Nullable

    public TipCardPreference castToTipCardPreferenceSafely(Preference preference) {

        return preference instanceof TipCardPreference ? (TipCardPreference) preference : null;

    public CardPreference castToCardPreferenceSafely(Preference preference) {

        return preference instanceof CardPreference ? (CardPreference) preference : null;

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 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;
@@ -73,7 +74,7 @@ public final class IncompatibleChargerTip extends BatteryTip { 
    public void updatePreference(Preference preference) {

        super.updatePreference(preference);

        final Context context = preference.getContext();

        final var cardPreference = castToTipCardPreferenceSafely(preference);

        final CardPreference cardPreference = castToCardPreferenceSafely(preference);

        if (cardPreference == null) {

            Log.e(TAG, "cast Preference to CardPreference failed");

            return;