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 am: 47ce042cf3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27358859

Change-Id: I3d4acd7fcf4fc9bbe2066fd3e2d0880565aa1cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-15 15:22:28 +00:00
committed by Automerger Merge Worker
parent de7c5e50a2 47ce042cf3
commit 302bd5750a
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

@@ -61,9 +61,8 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);
mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey()); mBatteryUsageProgressBarPref = screen.findPreference(getPreferenceKey());
// Set up loading text first to prevent layout flaky before info loaded. // Set up empty space text first to prevent layout flaky before info loaded.
mBatteryUsageProgressBarPref.setBottomSummary( mBatteryUsageProgressBarPref.setBottomSummary(" ");
mContext.getString(R.string.settings_license_activity_loading));
if (com.android.settings.Utils.isBatteryPresent(mContext)) { if (com.android.settings.Utils.isBatteryPresent(mContext)) {
quickUpdateHeaderPreference(); quickUpdateHeaderPreference();

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

@@ -35,7 +35,6 @@ import android.os.SystemProperties;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
@@ -483,11 +482,10 @@ public class BatteryHeaderPreferenceControllerTest {
} }
@Test @Test
public void displayPreference_init_showLoading() { public void displayPreference_init_showEmptySpace() {
mController.displayPreference(mPreferenceScreen); mController.displayPreference(mPreferenceScreen);
verify(mBatteryUsageProgressBarPref) verify(mBatteryUsageProgressBarPref).setBottomSummary(" ");
.setBottomSummary(mContext.getString(R.string.settings_license_activity_loading));
} }
private CharSequence formatBatteryPercentageText() { private CharSequence formatBatteryPercentageText() {