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

Commit 0610d2b6 authored by ykhung's avatar ykhung Committed by YK Hung
Browse files

Fix inconsistent connected without charging state in the Settings 

Make the "connected, not charging" state condition is the same between
Settings main page (in the TopLevelBatteryPreferenceController), and
sub- battery settings page (in the BatteryHeaderPreferenceController).

https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java;l=116-119

Fix: 285204150
Test: make RunSettingsRoboTests -j40

Change-Id: I9b09d521ca71b18e180c779f1a048d1ea4ba161a
parent 98df5bcd

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

+5 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; 


import android.content.ComponentName;

import android.content.Context;

import android.os.BatteryManager;

import android.util.Log;



import androidx.annotation.VisibleForTesting;
@@ -139,7 +140,10 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle 
        if (Utils.containsIncompatibleChargers(mContext, TAG)) {

            return mContext.getString(R.string.battery_info_status_not_charging);

        }

        if (!info.discharging && info.chargeLabel != null) {

        if (info.batteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {

            // Present status only if no remaining time or status anomalous

            return info.statusLabel;

        } else if (!info.discharging && info.chargeLabel != null) {

            return info.chargeLabel;

        } else if (info.remainingLabel == null) {

            return info.batteryPercentString;

tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java

+12 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.Intent; 
import android.hardware.usb.UsbManager;

import android.hardware.usb.UsbPort;

import android.hardware.usb.UsbPortStatus;

import android.os.BatteryManager;



import androidx.preference.Preference;

import androidx.test.core.app.ApplicationProvider;
@@ -145,6 +146,17 @@ public class TopLevelBatteryPreferenceControllerTest { 
                .isEqualTo(mContext.getString(R.string.battery_info_status_not_charging));

    }



    @Test

    public void getDashboardLabel_notChargingState_returnsCorrectLabel() {

        mController.mPreference = new Preference(mContext);

        BatteryInfo info = new BatteryInfo();

        info.batteryStatus = BatteryManager.BATTERY_STATUS_NOT_CHARGING;

        info.statusLabel = "expected returned label";



        assertThat(mController.getDashboardLabel(mContext, info, true))

                .isEqualTo(info.statusLabel);

    }



    @Test

    public void getSummary_batteryNotPresent_shouldShowWarningMessage() {

        mController.mIsBatteryPresent = false;