From 2e7f309226311dd646d74e00423a2b423ef227d0 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Wed, 8 Feb 2017 14:45:17 -0800 Subject: [PATCH] Don't truncate the GB used string. Bug: 34690731 Test: Settings robotest Change-Id: I2d809c0f80dad48a3bfecf6a6f2240129d54370e --- res/values/strings.xml | 2 +- .../StorageSummaryDonutPreferenceControllerTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 5bfe608c1dc..b79bfcd1e74 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8146,7 +8146,7 @@ Phone Storage - ^1 ^2 used + ^1 ^2 %1$s free diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index 990223aa3a2..2489bac2fe0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -69,7 +69,7 @@ public class StorageSummaryDonutPreferenceControllerTest { mController.updateBytes(0, 0); mController.updateState(mPreference); - assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B used"); + assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B"); assertThat(mPreference.getSummary().toString()).isEqualTo("0.00B free"); } @@ -78,7 +78,7 @@ public class StorageSummaryDonutPreferenceControllerTest { mController.updateBytes(1024, 1024 * 10); mController.updateState(mPreference); - assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB used"); + assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB"); assertThat(mPreference.getSummary().toString()).isEqualTo("9.00KB free"); } @@ -95,7 +95,7 @@ public class StorageSummaryDonutPreferenceControllerTest { mController.updateSizes(svp, volume); mController.updateState(mPreference); - assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB used"); + assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB"); assertThat(mPreference.getSummary().toString()).isEqualTo("1.00KB free"); }