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

Merge changes from topic "BytesFormatter" into main

Browse Source 
* changes:
  Migrate all data usage format use case
  Clean up unused DataUsageSummary.formatUsage
  Use BytesFormatter for data usage
This commit is contained in:
Chaohui Wang
2025-01-06 19:06:34 -08:00
committed by Android (Google) Code Review
parent 2387fc0053 d3448f3a91
commit 3380884efc
21 changed files with 75 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
View File

@@ -16,8 +16,6 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
@@ -92,15 +90,6 @@ public class DataUsageSummaryTest {
doNothing().when(mDataUsageSummary).addWifiSection();
}
@Test
public void formatUsage_shouldLookLikeFormatFileSize() {
final long usage = 2147483648L; // 2GB
final String formattedUsage =
DataUsageSummary.formatUsage(mContext, "^1", usage).toString();
final CharSequence formattedInIECUnit = DataUsageUtils.formatDataUsage(mContext, usage);
assertThat(formattedUsage).isEqualTo(formattedInIECUnit);
}
@Test
@Config(shadows = ShadowSubscriptionManager.class)
public void configuration_withSim_shouldShowMobileAndWifi() {

9
tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
View File

@@ -29,7 +29,6 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.telephony.TelephonyManager;
import android.util.DataUnit;
import org.junit.Before;
import org.junit.Test;
@@ -74,14 +73,6 @@ public final class DataUsageUtilsTest {
assertThat(hasMobileData).isFalse();
}
@Test
public void formatDataUsage_useIECUnit() {
final CharSequence formattedDataUsage = DataUsageUtils.formatDataUsage(
mContext, DataUnit.GIBIBYTES.toBytes(1));
assertThat(formattedDataUsage).isEqualTo("1.00 GB");
}
@Test
public void hasEthernet_shouldQueryEthernetSummaryForUser() throws Exception {
ShadowPackageManager pm = shadowOf(RuntimeEnvironment.application.getPackageManager());