PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update battery settings page loading text" into 24D1-dev

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-15 15:09:26 +00:00
committed by Android (Google) Code Review
parent 7489c93347 3ceffc39f9
commit 47ce042cf3
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
View File

@@ -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();

6
tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
View File

@@ -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() {