From 32992593d3e4c93b63e136733a2ee52d5fe52c94 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Tue, 14 Mar 2017 11:30:17 -0700 Subject: [PATCH 1/2] Add new strings. Bug: 36197674 Test: Manual Change-Id: Id198ae9a38caece97435b60561c1273f9408ef90 --- res/values/strings.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 79042c4e729..78aee500710 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2695,7 +2695,7 @@ System includes files that Android can\u2019t display individually. - ^1 may have saved photos, music, movies, apps, or other data that is taking up ^2 of storage. + ^1 may have saved photos, music, apps, or other data, using ^2 of storage. \n\nTo view details, switch to ^1. @@ -8268,12 +8268,15 @@ Files - Phone storage + Tablet storage + Phone storage ^1 ^2 - + %1$s free + + Used of %1$s %1$s%% @@ -8317,4 +8320,7 @@ Instant app + + Turn off the storage manager? + From f1050cb7c7e6806162ddca27788fb1c5a6b692cc Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Wed, 15 Mar 2017 15:48:40 -0700 Subject: [PATCH 2/2] Use total size and not free in Storage summary. Fixes: 36223330 Test: Settings Robotest Change-Id: I4406dc673961db0f91ae37da3abd0e1541517c7d --- res/values/strings.xml | 2 -- ...orageSummaryDonutPreferenceController.java | 4 ++-- ...eSummaryDonutPreferenceControllerTest.java | 21 +++++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 78aee500710..556a9796376 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8273,8 +8273,6 @@ ^1 ^2 - - %1$s free Used of %1$s diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java index c4613edf3f6..890d99e2845 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java @@ -55,8 +55,8 @@ public class StorageSummaryDonutPreferenceController extends PreferenceControlle summary.setTitle(TextUtils.expandTemplate( mContext.getText(R.string.storage_size_large_alternate), result.value, result.units)); - summary.setSummary(mContext.getString(R.string.storage_volume_free, - Formatter.formatFileSize(mContext, mTotalBytes - mUsedBytes))); + summary.setSummary(mContext.getString(R.string.storage_volume_total, + Formatter.formatShortFileSize(mContext, mTotalBytes))); summary.setPercent(mUsedBytes, mTotalBytes); summary.setEnabled(true); } 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 cbf3414424c..2c091f27893 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -55,6 +55,9 @@ import java.io.File; @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class StorageSummaryDonutPreferenceControllerTest { + private static final long KILOBYTE = 1024; // Note: When O comes around, this value changes! + private static final long MEGABYTE = KILOBYTE * KILOBYTE; + private static final long GIGABYTE = KILOBYTE * MEGABYTE; private Context mContext; private StorageSummaryDonutPreferenceController mController; private StorageSummaryDonutPreference mPreference; @@ -80,20 +83,20 @@ public class StorageSummaryDonutPreferenceControllerTest { @Test public void testEmpty() throws Exception { - mController.updateBytes(0, 0); + mController.updateBytes(0, 32 * GIGABYTE); mController.updateState(mPreference); assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B"); - assertThat(mPreference.getSummary().toString()).isEqualTo("0.00B free"); + assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 32GB"); } @Test - public void testUsedStorage() throws Exception { - mController.updateBytes(1024, 1024 * 10); + public void testTotalStorage() throws Exception { + mController.updateBytes(KILOBYTE, KILOBYTE * 10); mController.updateState(mPreference); assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB"); - assertThat(mPreference.getSummary().toString()).isEqualTo("9.00KB free"); + assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB"); } @Test @@ -102,15 +105,15 @@ public class StorageSummaryDonutPreferenceControllerTest { File file = Mockito.mock(File.class); StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class); when(volume.getPath()).thenReturn(file); - when(file.getTotalSpace()).thenReturn(1024L * 10); - when(file.getFreeSpace()).thenReturn(1024L); - when(svp.getPrimaryStorageSize()).thenReturn(1024L * 10); + when(file.getTotalSpace()).thenReturn(KILOBYTE * 10); + when(file.getFreeSpace()).thenReturn(KILOBYTE); + when(svp.getPrimaryStorageSize()).thenReturn(KILOBYTE * 10); mController.updateSizes(svp, volume); mController.updateState(mPreference); assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB"); - assertThat(mPreference.getSummary().toString()).isEqualTo("1.00KB free"); + assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB"); } @Test