Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47b07cc9 authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'storage-o-strings' 

* changes:
  Use total size and not free in Storage summary.
  Add new strings.
parents f2feb70b f1050cb7

res/values/strings.xml

+8 −4
Original line number Diff line number Diff line
@@ -2698,7 +2698,7 @@ 
    <string name="storage_detail_dialog_system">System includes files that Android can\u2019t display individually.</string>









    <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->









    <string name="storage_detail_dialog_user"><xliff:g id="user" example="Guest user">^1</xliff:g> may have saved photos, music, movies, apps, or other data that is taking up <xliff:g id="size" example="1.2 GB">^2</xliff:g> of storage.









    <string name="storage_detail_dialog_user"><xliff:g id="user" example="Guest user">^1</xliff:g> may have saved photos, music, apps, or other data, using <xliff:g id="size" example="1.2 GB">^2</xliff:g> of storage.









\n\nTo view details, switch to <xliff:g id="user" example="Guest user">^1</xliff:g>.</string>

















    <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->








@@ -8284,12 +8284,13 @@







    <string name="storage_files">Files</string>

















    <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->









    <string name="storage_settings_2">Phone storage</string>









    <string name="storage_settings_2" product="tablet">Tablet storage</string>









    <string name="storage_settings_2" product="default">Phone storage</string>

















    <!-- 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>









    <!-- Summary of a single storage volume free space. [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]-->









    <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]-->









    <string name="storage_percent_used"><xliff:g id="percent" example="50%">%1$s</xliff:g>%%</string>
















@@ -8333,4 +8334,7 @@







    <!-- Added as the value of a header field indicating this is an instant app (as opposed to installed normally) -->









    <string name="install_type_instant">Instant app</string>

















    <!-- Warning for when the automatic storage manager is turned off. [CHAR LIMIT=NONE] -->









    <string name="automatic_storage_manager_deactivation_warning">Turn off the storage manager?</string>

















</resources>

























src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -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);









    }
































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



+12
−9






























Original line number
Diff line number
Diff line







@@ -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