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

Use total size and not free in Storage summary.

Browse Source 
Fixes: 36223330
Test: Settings Robotest
Change-Id: I4406dc673961db0f91ae37da3abd0e1541517c7d
This commit is contained in:
Daniel Nishi
2017-03-15 15:48:40 -07:00
parent 32992593d3
commit f1050cb7c7
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -8273,8 +8273,6 @@
<!-- Summary of a single storage volume used space. [CHAR LIMIT=24] --> <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
<string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string> <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string>
<!-- Summary of a single storage volume free space. [DEPRECATED, TO BE REMOVED] [CHAR LIMIT=48]-->
<string name="storage_volume_free"><xliff:g id="total" example="32GB">%1$s</xliff:g> free</string>
<!-- Summary of a single storage volume total space. [CHAR LIMIT=48]--> <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
<string name="storage_volume_total">Used of <xliff:g id="total" example="32GB">%1$s</xliff:g></string> <string name="storage_volume_total">Used of <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
<!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]--> <!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]-->

4
src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
View File

@@ -55,8 +55,8 @@ public class StorageSummaryDonutPreferenceController extends PreferenceControlle
summary.setTitle(TextUtils.expandTemplate( summary.setTitle(TextUtils.expandTemplate(
mContext.getText(R.string.storage_size_large_alternate), result.value, mContext.getText(R.string.storage_size_large_alternate), result.value,
result.units)); result.units));
summary.setSummary(mContext.getString(R.string.storage_volume_free, summary.setSummary(mContext.getString(R.string.storage_volume_total,
Formatter.formatFileSize(mContext, mTotalBytes - mUsedBytes))); Formatter.formatShortFileSize(mContext, mTotalBytes)));
summary.setPercent(mUsedBytes, mTotalBytes); summary.setPercent(mUsedBytes, mTotalBytes);
summary.setEnabled(true); summary.setEnabled(true);
} }

21
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
View File

@@ -55,6 +55,9 @@ import java.io.File;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class StorageSummaryDonutPreferenceControllerTest { 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 Context mContext;
private StorageSummaryDonutPreferenceController mController; private StorageSummaryDonutPreferenceController mController;
private StorageSummaryDonutPreference mPreference; private StorageSummaryDonutPreference mPreference;
@@ -80,20 +83,20 @@ public class StorageSummaryDonutPreferenceControllerTest {
@Test @Test
public void testEmpty() throws Exception { public void testEmpty() throws Exception {
mController.updateBytes(0, 0); mController.updateBytes(0, 32 * GIGABYTE);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B"); assertThat(mPreference.getTitle().toString()).isEqualTo("0.00B");
assertThat(mPreference.getSummary().toString()).isEqualTo("0.00B free"); assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 32GB");
} }
@Test @Test
public void testUsedStorage() throws Exception { public void testTotalStorage() throws Exception {
mController.updateBytes(1024, 1024 * 10); mController.updateBytes(KILOBYTE, KILOBYTE * 10);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB"); assertThat(mPreference.getTitle().toString()).isEqualTo("1.00KB");
assertThat(mPreference.getSummary().toString()).isEqualTo("9.00KB free"); assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
} }
@Test @Test
@@ -102,15 +105,15 @@ public class StorageSummaryDonutPreferenceControllerTest {
File file = Mockito.mock(File.class); File file = Mockito.mock(File.class);
StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class); StorageVolumeProvider svp = Mockito.mock(StorageVolumeProvider.class);
when(volume.getPath()).thenReturn(file); when(volume.getPath()).thenReturn(file);
when(file.getTotalSpace()).thenReturn(1024L * 10); when(file.getTotalSpace()).thenReturn(KILOBYTE * 10);
when(file.getFreeSpace()).thenReturn(1024L); when(file.getFreeSpace()).thenReturn(KILOBYTE);
when(svp.getPrimaryStorageSize()).thenReturn(1024L * 10); when(svp.getPrimaryStorageSize()).thenReturn(KILOBYTE * 10);
mController.updateSizes(svp, volume); mController.updateSizes(svp, volume);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB"); assertThat(mPreference.getTitle().toString()).isEqualTo("9.00KB");
assertThat(mPreference.getSummary().toString()).isEqualTo("1.00KB free"); assertThat(mPreference.getSummary().toString()).isEqualTo("Used of 10KB");
} }
@Test @Test