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

Commit 6c8bf464 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't truncate the GB used string."

parents 59268909 2e7f3092

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -8160,7 +8160,7 @@ 
    <string name="storage_settings_2" >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><small> <xliff:g id="unit" example="KB">^2</xliff:g> used</small></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. [CHAR LIMIT=48]-->









    <string name="storage_volume_free"><xliff:g id="total" example="32GB">%1$s</xliff:g> free</string>









    <!-- The percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=4]-->

























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



+3
−3






























Original line number
Diff line number
Diff line







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









    }