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

Commit 7a7a55c1 authored by Jeffrey Carlyle's avatar Jeffrey Carlyle Committed by Automerger Merge Worker
Browse files

Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434 

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

Change-Id: I36bc3699d0af28ad40e52fd11946ae3222eb90a4
parents c1b516b2 d553d434

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

+18 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.Utils;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -49,6 +50,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController 
    @VisibleForTesting

    static final String KEY_BATTERY_HEADER = "battery_header";



    @VisibleForTesting

    BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;

    @VisibleForTesting

    BatteryMeterView mBatteryMeterView;

    @VisibleForTesting
@@ -66,6 +69,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController 
    public BatteryHeaderPreferenceController(Context context, String key) {

        super(context, key);

        mPowerManager = context.getSystemService(PowerManager.class);

        mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)

                .getBatteryStatusFeatureProvider(context);

    }



    public void setActivity(Activity activity) {
@@ -107,17 +112,26 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController 


    public void updateHeaderPreference(BatteryInfo info) {

        mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));

        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {

            if (info.remainingLabel == null) {

                mSummary1.setText(info.statusLabel);

            } else {

                mSummary1.setText(info.remainingLabel);

            }

        }



        mBatteryMeterView.setBatteryLevel(info.batteryLevel);

        mBatteryMeterView.setCharging(!info.discharging);

        mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());

    }



    /**

     * Callback which receives text for the summary line.

     */

    public void updateBatteryStatus(String statusLabel) {

        mSummary1.setText(statusLabel);

    }



    public void quickUpdateHeaderPreference() {

        Intent batteryBroadcast = mContext.registerReceiver(null,

                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.fuelgauge;



/**

 * Feature Provider used to retrieve battery status

 */

public interface BatteryStatusFeatureProvider {



    /**

     * Trigger a battery status update; return false if built-in status should be used.

     */

    boolean triggerBatteryStatusUpdate(

            BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info);

}

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

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.fuelgauge;



import android.content.Context;



/**

 * Used to override battery status string in Battery Header.

 */

public class BatteryStatusFeatureProviderImpl implements BatteryStatusFeatureProvider {



    protected Context mContext;



    public BatteryStatusFeatureProviderImpl(Context context) {

        mContext = context.getApplicationContext();

    }



    @Override

    public boolean triggerBatteryStatusUpdate(

            BatteryHeaderPreferenceController batteryHeaderPreferenceController, BatteryInfo info) {

        return false;

    }

}

src/com/android/settings/overlay/FeatureFactory.java

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settings.bluetooth.BluetoothFeatureProvider; 
import com.android.settings.dashboard.DashboardFeatureProvider;

import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;

import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;

import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.gestures.AssistGestureFeatureProvider;

import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -103,6 +104,12 @@ public abstract class FeatureFactory { 


    public abstract PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context);



    /**

     * Retrieve implementation for Battery Status feature.

     */

    public abstract BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(

            Context context);



    public abstract DashboardFeatureProvider getDashboardFeatureProvider(Context context);



    public abstract DockUpdaterFeatureProvider getDockUpdaterFeatureProvider();

src/com/android/settings/overlay/FeatureFactoryImpl.java

+12 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; 
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;

import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;

import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;

import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;

import com.android.settings.fuelgauge.BatteryStatusFeatureProviderImpl;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;

import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -78,6 +80,7 @@ public class FeatureFactoryImpl extends FeatureFactory { 
    private SecurityFeatureProvider mSecurityFeatureProvider;

    private SuggestionFeatureProvider mSuggestionFeatureProvider;

    private PowerUsageFeatureProvider mPowerUsageFeatureProvider;

    private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;

    private AssistGestureFeatureProvider mAssistGestureFeatureProvider;

    private UserFeatureProvider mUserFeatureProvider;

    private SlicesFeatureProvider mSlicesFeatureProvider;
@@ -110,6 +113,15 @@ public class FeatureFactoryImpl extends FeatureFactory { 
        return mPowerUsageFeatureProvider;

    }



    @Override

    public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {

        if (mBatteryStatusFeatureProvider == null) {

            mBatteryStatusFeatureProvider = new BatteryStatusFeatureProviderImpl(

                    context.getApplicationContext());

        }

        return mBatteryStatusFeatureProvider;

    }



    @Override

    public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {

        if (mDashboardFeatureProvider == null) {