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

Commit 19046965 authored by mxyyiyi's avatar mxyyiyi Committed by Pajace Chen
Browse files

Refactor flags of Power Anomaly Tips in Settings Intelligence.(1/2) 

- Remove unused flag is_battery_tips_feedback_enabled
- Update logic about is_battery_tips_enabled

Bug: 284893240
Bug: 291689623
Test: Manual
Change-Id: I826f517aa61e0c970048164706c4512ac3e0472d
Merged-In: I826f517aa61e0c970048164706c4512ac3e0472d
parent f2735dec

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

+0 −5
Original line number Diff line number Diff line
@@ -43,11 +43,6 @@ public interface PowerUsageFeatureProvider { 
     */

    boolean isBatteryTipsEnabled();



    /**

     * Check whether the feedback card is enabled in the battery tips card

     */

    boolean isBatteryTipsFeedbackEnabled();



    /**

     * Returns a threshold (in milliseconds) for the minimal screen on time in battery usage list

     */

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -80,11 +80,6 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
        return false;

    }



    @Override

    public boolean isBatteryTipsFeedbackEnabled() {

        return false;

    }



    @Override

    public double getBatteryUsageListScreenOnTimeThresholdInMs() {

        return 0;

src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java

+0 −3
Original line number Diff line number Diff line
@@ -374,9 +374,6 @@ public class BatteryChartPreferenceController extends AbstractPreferenceControll 
            }

            mOnBatteryUsageUpdatedListener.onBatteryUsageUpdated(

                    slotUsageData, getSlotInformation(), isBatteryUsageMapNullOrEmpty());



            Log.d(TAG, "isBatteryTipsEnabled = "

                    + mPowerUsageFeatureProvider.isBatteryTipsEnabled());

            if (mOnBatteryTipsUpdatedListener != null) {

                mExecutor.execute(() -> {

                    final PowerAnomalyEventList anomalyEventList = mPowerUsageFeatureProvider

src/com/android/settings/fuelgauge/batteryusage/BatteryTipsCardPreference.java

+0 −16
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.os.Bundle; 
import android.text.TextUtils;

import android.util.AttributeSet;

import android.view.View;

import android.widget.ImageButton;

import android.widget.ImageView;

import android.widget.LinearLayout;

import android.widget.TextView;
@@ -34,7 +33,6 @@ import androidx.preference.PreferenceViewHolder; 
import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.core.SubSettingLauncher;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -47,7 +45,6 @@ public class BatteryTipsCardPreference extends Preference implements View.OnClic 


    private static final String TAG = "BatteryTipsCardPreference";



    private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;

    private final MetricsFeatureProvider mMetricsFeatureProvider;



    private String mAnomalyEventId;
@@ -71,7 +68,6 @@ public class BatteryTipsCardPreference extends Preference implements View.OnClic 
        setLayoutResource(R.layout.battery_tips_card);

        setSelectable(false);

        final FeatureFactory featureFactory = FeatureFactory.getFactory(context);

        mPowerUsageFeatureProvider =  featureFactory.getPowerUsageFeatureProvider(context);

        mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();

        mPowerAnomalyKey = null;

    }
@@ -191,17 +187,5 @@ public class BatteryTipsCardPreference extends Preference implements View.OnClic 
        if (mIconResourceId != 0) {

            ((ImageView) view.findViewById(R.id.icon)).setImageResource(mIconResourceId);

        }



        if (!mPowerUsageFeatureProvider.isBatteryTipsFeedbackEnabled()) {

            return;

        }

        view.findViewById(R.id.tips_card)

                .setBackgroundResource(R.drawable.battery_tips_half_rounded_top_bg);

        view.findViewById(R.id.feedback_card).setVisibility(View.VISIBLE);



        ImageButton thumbUpButton = (ImageButton) view.findViewById(R.id.thumb_up);

        thumbUpButton.setOnClickListener(this);

        ImageButton thumbDownButton = (ImageButton) view.findViewById(R.id.thumb_down);

        thumbDownButton.setOnClickListener(this);

    }

}

src/com/android/settings/fuelgauge/batteryusage/BatteryTipsController.java

+0 −12
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.preference.PreferenceScreen; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -38,7 +37,6 @@ public class BatteryTipsController extends BasePreferenceController { 
    private static final String ROOT_PREFERENCE_KEY = "battery_tips_category";

    private static final String CARD_PREFERENCE_KEY = "battery_tips_card";



    private final PowerUsageFeatureProvider mPowerUsageFeatureProvider;

    private final MetricsFeatureProvider mMetricsFeatureProvider;



    @VisibleForTesting
@@ -47,14 +45,9 @@ public class BatteryTipsController extends BasePreferenceController { 
    public BatteryTipsController(Context context) {

        super(context, ROOT_PREFERENCE_KEY);

        final FeatureFactory featureFactory = FeatureFactory.getFactory(context);

        mPowerUsageFeatureProvider =  featureFactory.getPowerUsageFeatureProvider(context);

        mMetricsFeatureProvider = featureFactory.getMetricsFeatureProvider();

    }



    private boolean isTipsCardVisible() {

        return mPowerUsageFeatureProvider.isBatteryTipsEnabled();

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;
@@ -102,12 +95,7 @@ public class BatteryTipsController extends BasePreferenceController { 
                : getStringFromResource(resourceId, resourceIndex);

    }



    @VisibleForTesting

    void handleBatteryTipsCardUpdated(PowerAnomalyEvent powerAnomalyEvent) {

        if (!isTipsCardVisible()) {

            mCardPreference.setVisible(false);

            return;

        }

        if (powerAnomalyEvent == null) {

            mCardPreference.setVisible(false);

            return;