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

Commit 3fc8a09d authored by Wesley Wang's avatar Wesley Wang
Browse files

Clean up unused logic and value

Bug: 249474949
Test: atest SystemUITests
Change-Id: Ifa4b0edc96869e5d9e4fe09829a312355dc3690a
parent 5265c2ba
Loading
Loading
Loading
Loading
+2 −25
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ import com.android.systemui.util.NotificationChannels;
import com.android.systemui.util.settings.GlobalSettings;
import com.android.systemui.volume.Events;

import dagger.Lazy;

import java.io.PrintWriter;
import java.lang.ref.WeakReference;
import java.text.NumberFormat;
@@ -83,8 +85,6 @@ import java.util.Objects;

import javax.inject.Inject;

import dagger.Lazy;

/**
 */
@SysUISingleton
@@ -132,7 +132,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
    private static final String ACTION_AUTO_SAVER_NO_THANKS =
            "PNW.autoSaverNoThanks";

    private static final String ACTION_ENABLE_SEVERE_BATTERY_DIALOG = "PNW.enableSevereDialog";
    private static final String EXTRA_SCHEDULED_BY_PERCENTAGE =
            "extra_scheduled_by_percentage";
    public static final String BATTERY_SAVER_SCHEDULE_SCREEN_INTENT_ACTION =
@@ -155,7 +154,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
    private final Intent mOpenBatterySettings = settings(Intent.ACTION_POWER_USAGE_SUMMARY);
    private final Intent mOpenBatterySaverSettings =
            settings(Settings.ACTION_BATTERY_SAVER_SETTINGS);
    private final boolean mUseSevereDialog;

    private int mBatteryLevel;
    private int mBucket;
@@ -177,7 +175,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
    private ActivityStarter mActivityStarter;
    private final BroadcastSender mBroadcastSender;
    private final UiEventLogger mUiEventLogger;
    private GlobalSettings mGlobalSettings;
    private final UserTracker mUserTracker;
    private final Lazy<BatteryController> mBatteryControllerLazy;
    private final DialogLaunchAnimator mDialogLaunchAnimator;
@@ -198,9 +195,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
        mBroadcastSender = broadcastSender;
        mBatteryControllerLazy = batteryControllerLazy;
        mDialogLaunchAnimator = dialogLaunchAnimator;
        mUseSevereDialog = mContext.getResources().getBoolean(R.bool.config_severe_battery_dialog);
        mUiEventLogger = uiEventLogger;
        mGlobalSettings = globalSettings;
        mUserTracker = userTracker;
    }

@@ -287,20 +282,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
    }

    protected void showWarningNotification() {
        if (mGlobalSettings.getInt(Global.LOW_POWER_MODE_REMINDER_ENABLED, 1) == 0) {
            return;
        }
        if (showSevereLowBatteryDialog()) {
            mBroadcastSender.sendBroadcast(new Intent(ACTION_ENABLE_SEVERE_BATTERY_DIALOG)
                    .setPackage(mContext.getPackageName())
                    .putExtra(EXTRA_SCHEDULED_BY_PERCENTAGE, isScheduledByPercentage())
                    .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY
                            | Intent.FLAG_RECEIVER_FOREGROUND));
            // Reset the state once dialog been enabled
            dismissLowBatteryNotification();
            mPlaySound = false;
            return;
        }
        if (isScheduledByPercentage()) {
            return;
        }
@@ -349,10 +330,6 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI {
        mNoMan.notifyAsUser(TAG_BATTERY, SystemMessage.NOTE_POWER_LOW, n, UserHandle.ALL);
    }

    private boolean showSevereLowBatteryDialog() {
        return mBucket < -1 && mUseSevereDialog;
    }

    /**
     * Checking battery saver schedule mode is set as "Based on percentage" or not.
     *
+0 −11
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import android.os.BatteryManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import android.test.suitebuilder.annotation.SmallTest;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -157,16 +156,6 @@ public class PowerNotificationWarningsTest extends SysuiTestCase {
                eq(SystemMessage.NOTE_BAD_CHARGER), any());
    }

    @Test
    public void testDisableLowBatteryReminder_noNotification() {
        mGlobalSettings.putInt(Settings.Global.LOW_POWER_MODE_REMINDER_ENABLED, 0);

        mPowerNotificationWarnings.showLowBatteryWarning(false);

        verify(mMockNotificationManager, times(0))
                .notifyAsUser(anyString(), eq(SystemMessage.NOTE_POWER_LOW), any(), any());
    }

    @Test
    public void testShowLowBatteryNotification_NotifyAsUser() {
        mPowerNotificationWarnings.showLowBatteryWarning(false);