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

Commit fda5d5a6 authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Update the system info dialog. 

The string is updated as well as where the dialog shows up.

Change-Id: If1a3b17dca04fe81f52dbdc2353db34ce7adc49a
Fixes: 34857117
Test: Robotest
parent 34b75da9

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2702,7 +2702,7 @@ 
\n\nTo see the visible contents of this <xliff:g id="name" example="SD card">^1</xliff:g>, tap Explore.</string>









    <!-- Body of dialog informing user about the storage used by the Android System [CHAR LIMIT=NONE]-->









    <string name="storage_detail_dialog_system">System includes files that Android can\u2019t display individually.</string>









    <string name="storage_detail_dialog_system">System includes files used to run Android version <xliff:g id="version" example="8.0">%s</xliff:g></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, apps, or other data, using <xliff:g id="size" example="1.2 GB">^2</xliff:g> of storage.
































src/com/android/settings/deviceinfo/PrivateVolumeSettings.java



+3
−1






























Original line number
Diff line number
Diff line







@@ -27,6 +27,7 @@ import android.content.pm.IPackageDataObserver;







import android.content.pm.PackageInfo;









import android.content.pm.PackageManager;









import android.content.pm.UserInfo;









import android.os.Build;









import android.os.Bundle;









import android.os.Environment;









import android.os.UserHandle;








@@ -759,7 +760,8 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {







        @Override









        public Dialog onCreateDialog(Bundle savedInstanceState) {









            return new AlertDialog.Builder(getActivity())









                    .setMessage(R.string.storage_detail_dialog_system)









                    .setMessage(getContext().getString(R.string.storage_detail_dialog_system,









                            Build.VERSION.RELEASE))









                    .setPositiveButton(android.R.string.ok, null)









                    .create();









        }
































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



+7
−2






























Original line number
Diff line number
Diff line







@@ -35,6 +35,7 @@ import com.android.settings.Utils;







import com.android.settings.applications.ManageApplications;









import com.android.settings.core.PreferenceController;









import com.android.settings.core.instrumentation.MetricsFeatureProvider;









import com.android.settings.deviceinfo.PrivateVolumeSettings.SystemInfoFragment;









import com.android.settings.deviceinfo.StorageItemPreference;









import com.android.settings.overlay.FeatureFactory;









import com.android.settingslib.deviceinfo.StorageMeasurement;








@@ -52,6 +53,7 @@ public class StorageItemPreferenceController extends PreferenceController {







    private static final String TAG = "StorageItemPreference";



















    private static final String IMAGE_MIME_TYPE = "image/*";









    private static final String SYSTEM_FRAGMENT_TAG = "SystemInfo";



















    @VisibleForTesting









    static final String PHOTO_KEY = "pref_photos_videos";








@@ -104,8 +106,6 @@ public class StorageItemPreferenceController extends PreferenceController {







            return false;









        }



















        // TODO: Currently, this reflects the existing behavior for these toggles.









        //       After the intermediate views are built, swap them in.









        Intent intent = null;









        if (preference.getKey() == null) {









            return false;








@@ -133,6 +133,11 @@ public class StorageItemPreferenceController extends PreferenceController {







                FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(









                        mContext, MetricsEvent.STORAGE_FILES);









                break;









            case SYSTEM_KEY:









                final SystemInfoFragment dialog = new SystemInfoFragment();









                dialog.setTargetFragment(mFragment, 0);









                dialog.show(mFragment.getFragmentManager(), SYSTEM_FRAGMENT_TAG);









                return true;









        }



















        if (intent != null) {
































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



+11
−0






























Original line number
Diff line number
Diff line







@@ -20,6 +20,7 @@ import static com.android.settings.TestUtils.KILOBYTE;







import static com.google.common.truth.Truth.assertThat;



















import static org.mockito.Matchers.any;









import static org.mockito.Matchers.anyString;









import static org.mockito.Matchers.eq;









import static org.mockito.Mockito.mock;









import static org.mockito.Mockito.spy;








@@ -45,6 +46,7 @@ import com.android.settings.SubSettings;







import com.android.settings.TestConfig;









import com.android.settings.applications.ManageApplications;









import com.android.settings.core.instrumentation.MetricsFeatureProvider;









import com.android.settings.deviceinfo.PrivateVolumeSettings;









import com.android.settings.deviceinfo.StorageItemPreference;









import com.android.settings.testutils.FakeFeatureFactory;









import com.android.settingslib.applications.StorageStatsSource;








@@ -186,6 +188,15 @@ public class StorageItemPreferenceControllerTest {







                .isEqualTo(R.string.game_storage_settings);









    }



















    @Test









    public void testClickSystem() {









        mPreference.setKey("pref_system");









        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();



















        verify(mFragment.getFragmentManager().beginTransaction()).add(









                any(PrivateVolumeSettings.SystemInfoFragment.class), anyString());









    }



















    @Test









    public void testMeasurementCompletedUpdatesPreferences() {









        StorageItemPreference audio = new StorageItemPreference(mContext);