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

Commit f8a16513 authored by William Leshner's avatar William Leshner
Browse files

Revert "Update charging string to match keyguard." 

This reverts commit a03acf9d.

Reason for revert: It would be better to use a dedicated bugfix flag for this, so we only need to cherrypick one change to BP3A

Change-Id: I1814d9a09aa09d5c8e126eeb8a2e952d9ee982f0
parent a03acf9d

packages/SystemUI/src/com/android/systemui/lowlightclock/ChargingStatusProvider.java

+2 −17
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.systemui.lowlightclock;



import static android.service.dreams.Flags.dreamsV2;



import android.content.Context;

import android.content.res.Resources;

import android.os.BatteryManager;
@@ -32,7 +30,6 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback; 
import com.android.settingslib.fuelgauge.BatteryStatus;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.KeyguardIndicationController;



import java.text.NumberFormat;
@@ -56,8 +53,6 @@ public class ChargingStatusProvider { 
    // callback being GC'd.

    private ChargingStatusCallback mChargingStatusCallback;



    private final KeyguardIndicationController mKeyguardIndicationController;



    private Callback mCallback;



    @Inject
@@ -65,13 +60,11 @@ public class ChargingStatusProvider { 
            Context context,

            @Main Resources resources,

            IBatteryStats iBatteryStats,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            KeyguardIndicationController keyguardIndicationController) {

            KeyguardUpdateMonitor keyguardUpdateMonitor) {

        mContext = context;

        mResources = resources;

        mBatteryInfo = iBatteryStats;

        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mKeyguardIndicationController = keyguardIndicationController;

    }



    /**
@@ -164,15 +157,7 @@ public class ChargingStatusProvider { 
        if (mCallback != null) {

            final boolean shouldShowStatus =

                    mBatteryState.isPowerPluggedIn() || mBatteryState.isBatteryDefenderEnabled();

            mCallback.onChargingStatusChanged(shouldShowStatus, getChargingString());

        }

    }



    private String getChargingString() {

        if (dreamsV2()) {

            return mKeyguardIndicationController.getPowerChargingString();

        } else {

            return computeChargingString();

            mCallback.onChargingStatusChanged(shouldShowStatus, computeChargingString());

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+0 −4
Original line number Diff line number Diff line
@@ -479,10 +479,6 @@ public class KeyguardIndicationController { 
        mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);

    }



    public String getPowerChargingString() {

        return computePowerChargingStringIndication();

    }



    private void handleAlignStateChanged(int alignState) {

        String alignmentIndication = "";

        if (alignState == DockManager.ALIGN_STATE_POOR) {

packages/SystemUI/tests/src/com/android/systemui/lowlightclock/ChargingStatusProviderTest.java

+3 −25
Original line number Diff line number Diff line
@@ -26,11 +26,8 @@ import static org.mockito.Mockito.when; 
import android.content.res.Resources;

import android.os.BatteryManager;

import android.os.RemoteException;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.service.dreams.Flags;

import android.testing.AndroidTestingRunner;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.app.IBatteryStats;
@@ -39,7 +36,6 @@ import com.android.keyguard.KeyguardUpdateMonitorCallback; 
import com.android.settingslib.fuelgauge.BatteryStatus;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.KeyguardIndicationController;



import org.junit.Before;

import org.junit.Test;
@@ -49,7 +45,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidTestingRunner.class)

public class ChargingStatusProviderTest extends SysuiTestCase {

    @Mock

    private Resources mResources;
@@ -58,8 +54,6 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
    @Mock

    private KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    @Mock

    private KeyguardIndicationController mKeyguardIndicationController;

    @Mock

    private ChargingStatusProvider.Callback mCallback;



    private ChargingStatusProvider mProvider;
@@ -69,11 +63,7 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
        MockitoAnnotations.initMocks(this);



        mProvider = new ChargingStatusProvider(

                mContext,

                mResources,

                mBatteryInfo,

                mKeyguardUpdateMonitor,

                mKeyguardIndicationController);

                mContext, mResources, mBatteryInfo, mKeyguardUpdateMonitor);

    }



    @Test
@@ -153,7 +143,6 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_DREAMS_V2)

    public void testChargingStatusReportsChargingLimitedWhenOverheated() {

        ArgumentCaptor<KeyguardUpdateMonitorCallback> keyguardUpdateMonitorCallbackArgumentCaptor =

                ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback.class);
@@ -167,7 +156,6 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_DREAMS_V2)

    public void testChargingStatusReportsChargedWhenCharged() {

        ArgumentCaptor<KeyguardUpdateMonitorCallback> keyguardUpdateMonitorCallbackArgumentCaptor =

                ArgumentCaptor.forClass(KeyguardUpdateMonitorCallback.class);
@@ -181,7 +169,6 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_DREAMS_V2)

    public void testChargingStatusReportsPluggedInWhenDockedAndChargingTimeUnknown() throws

            RemoteException {

        ArgumentCaptor<KeyguardUpdateMonitorCallback> keyguardUpdateMonitorCallbackArgumentCaptor =
@@ -198,7 +185,6 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_DREAMS_V2)

    public void testChargingStatusReportsTimeRemainingWhenDockedAndCharging() throws

            RemoteException {

        ArgumentCaptor<KeyguardUpdateMonitorCallback> keyguardUpdateMonitorCallbackArgumentCaptor =
@@ -214,14 +200,6 @@ public class ChargingStatusProviderTest extends SysuiTestCase { 
                eq(R.string.keyguard_indication_charging_time_dock), any(), any());

    }



    @Test

    @EnableFlags(Flags.FLAG_DREAMS_V2)

    public void testAsksKeyguardForChargingStatusInDreamsV2() {

        mProvider.startUsing(mCallback);

        verify(mCallback).onChargingStatusChanged(false, null);

        verify(mKeyguardIndicationController).getPowerChargingString();

    }



    private BatteryStatus getUnpluggedBattery() {

        return new BatteryStatus(BatteryManager.BATTERY_STATUS_NOT_CHARGING,

                80, BatteryManager.BATTERY_PLUGGED_ANY, BatteryManager.BATTERY_HEALTH_GOOD,