From 0cac1c2b43dbfa91eaa5ec2ba5a7db85c9b7e118 Mon Sep 17 00:00:00 2001 From: Garvita Jain Date: Thu, 13 Mar 2025 20:15:41 -0700 Subject: [PATCH] Revert "[L10n fix] Use whitespace regex for splitting string by delimiter." This reverts commit 08e18d624136f36a7a1dd22798d8d52abbda859c. Reason for revert: Change-Id: I169abdd990d94d6a04d0a500b9802ff438c21876 --- .../deviceinfo/TopLevelStoragePreferenceController.java | 2 +- .../homepage/contextualcards/slices/LowStorageSlice.java | 2 +- .../deviceinfo/TopLevelStoragePreferenceControllerTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java index a81303597e5..785d84a0818 100644 --- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java +++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java @@ -93,7 +93,7 @@ public class TopLevelStoragePreferenceController extends BasePreferenceControlle private String getSummary(long usedBytes, long totalBytes) { NumberFormat percentageFormat = NumberFormat.getPercentInstance(); final String[] freeSpace = - Formatter.formatFileSize(mContext, totalBytes - usedBytes).split("\\s"); + Formatter.formatFileSize(mContext, totalBytes - usedBytes).split(" "); return mContext.getString(R.string.storage_summary, totalBytes == 0L ? "0" : percentageFormat.format(((double) usedBytes) / totalBytes), freeSpace[0], freeSpace[1]); diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index 92fa0122e4f..121bd82dfb1 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -65,7 +65,7 @@ public class LowStorageSlice implements CustomSliceable { // Generate Low storage Slice. final String percentageString = NumberFormat.getPercentInstance().format(usedPercentage); final String[] freeSizeString = - Formatter.formatFileSize(mContext, info.freeBytes).split("\\s"); + Formatter.formatFileSize(mContext, info.freeBytes).split(" "); final ListBuilder listBuilder = new ListBuilder(mContext, CustomSliceRegistry.LOW_STORAGE_SLICE_URI, ListBuilder.INFINITY).setAccentColor( diff --git a/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java index 7b6eb5bf20c..300d0288a8f 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java @@ -86,7 +86,7 @@ public class TopLevelStoragePreferenceControllerTest { when(mController.getStorageManagerVolumeProvider()) .thenReturn(mStorageManagerVolumeProvider); final String percentage = NumberFormat.getPercentInstance().format(1); - final String[] freeSpace = Formatter.formatFileSize(mContext, 0).split("\\s"); + final String[] freeSpace = Formatter.formatFileSize(mContext, 0).split(" "); final Preference preference = new Preference(mContext); // Wait for asynchronous thread to finish, otherwise test will flake.