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

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

Update battery settings page loading text 

 - Update the loading text into empty space text to prevent layout flaky before info loaded

Bug: N/A
Test: atest SettingsRoboTests
Change-Id: I272405f5045a682533a4e9405a9fd91f6c507f7e
parent 381638f2

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

+2 −3
Original line number Diff line number Diff line
@@ -59,9 +59,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController 
    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());

        // Set up loading text first to prevent layout flaky before info loaded.

        mBatteryUsageProgressBarPref.setBottomSummary(

                mContext.getString(R.string.settings_license_activity_loading));

        // Set up empty space text first to prevent layout flaky before info loaded.

        mBatteryUsageProgressBarPref.setBottomSummary(" ");



        if (com.android.settings.Utils.isBatteryPresent(mContext)) {

            quickUpdateHeaderPreference();

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

+2 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.text.TextUtils; 


import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
@@ -374,11 +373,10 @@ public class BatteryHeaderPreferenceControllerTest { 
    }



    @Test

    public void displayPreference_init_showLoading() {

    public void displayPreference_init_showEmptySpace() {

        mController.displayPreference(mPreferenceScreen);



        verify(mBatteryUsageProgressBarPref)

                .setBottomSummary(mContext.getString(R.string.settings_license_activity_loading));

        verify(mBatteryUsageProgressBarPref).setBottomSummary(" ");

    }



    private CharSequence formatBatteryPercentageText() {