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

Commit 918e7aa9 authored by Oliver Middleton's avatar Oliver Middleton Committed by Steve Kondik
Browse files

Use actual storage type for format message strings 

Change-Id: I214120303bf6c12c297332fa314ce80bc686da46
parent daaeafff

core/java/com/android/internal/app/ExternalMediaFormatActivity.java

+6 −2
Original line number Diff line number Diff line
@@ -81,11 +81,15 @@ public class ExternalMediaFormatActivity extends AlertActivity implements Dialog 
        Log.d("ExternalMediaFormatActivity", "The storage volume to be formatted is : "

                + mStorageVolume.getPath());



        boolean isUsbStorage = mStorageVolume.getDescriptionId() ==

                com.android.internal.R.string.storage_usb;



        // Set up the "dialog"

        final AlertController.AlertParams p = mAlertParams;

        p.mTitle = getString(com.android.internal.R.string.extmedia_format_title);

        p.mMessage = String.format(

                getString(com.android.internal.R.string.extmedia_format_message_cm),

        p.mMessage = String.format(getString(isUsbStorage ?

                        com.android.internal.R.string.usb_extmedia_format_message :

                        com.android.internal.R.string.sd_extmedia_format_message),

                mStorageVolume.getPath());

        p.mPositiveButtonText = getString(com.android.internal.R.string.extmedia_format_button_format);

        p.mPositiveButtonListener = this;

core/java/com/android/internal/os/storage/ExternalStorageFormatter.java

+14 −7
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ public class ExternalStorageFormatter extends Service 
        String status = null;

        String extStoragePath = null;

        StorageVolume physicalVol;

        boolean isUsbStorage = false;

        try {

            final IMountService mountService = getMountService();

            final StorageVolume[] volumes = mountService.getVolumeList();
@@ -187,11 +188,13 @@ public class ExternalStorageFormatter extends Service 
                    } else {

                        physicalVol = physicalVols.get(0);

                        status = mStorageManager.getVolumeState(physicalVol.getPath()) ;

                        isUsbStorage = physicalVol.getDescriptionId() == R.string.storage_usb;

                    }

                }

                //else use the specified storage volume

                else {

                        status = mStorageManager.getVolumeState(mStorageVolume.getPath());

                        isUsbStorage = mStorageVolume.getDescriptionId() == R.string.storage_usb;

                }

        }

        catch (RemoteException e) {
@@ -199,7 +202,8 @@ public class ExternalStorageFormatter extends Service 
        }

        if (Environment.MEDIA_MOUNTED.equals(status)

                || Environment.MEDIA_MOUNTED_READ_ONLY.equals(status)) {

            updateProgressDialog(R.string.progress_unmounting);

            updateProgressDialog(isUsbStorage ? R.string.usb_progress_unmounting :

                                                R.string.sd_progress_unmounting);

            try {

                if(mIsFormatSuccess) return;

                final IMountService mountService = getMountService();
@@ -230,7 +234,10 @@ public class ExternalStorageFormatter extends Service 
        else if (Environment.MEDIA_NOFS.equals(status)

                || Environment.MEDIA_UNMOUNTED.equals(status)

                || Environment.MEDIA_UNMOUNTABLE.equals(status)) {

            updateProgressDialog(R.string.progress_erasing);

            updateProgressDialog(isUsbStorage ? R.string.usb_progress_erasing :

                                                R.string.sd_progress_erasing);

            final int toastTextResId = isUsbStorage ? R.string.usb_format_error :

                                                      R.string.sd_format_error;

            final IMountService mountService = getMountService();

            if (mountService != null) {

                new Thread() {
@@ -263,7 +270,7 @@ public class ExternalStorageFormatter extends Service 
                        } catch (Exception e) {

                            Looper.prepare();

                            Toast.makeText(ExternalStorageFormatter.this,

                                    R.string.format_error, Toast.LENGTH_LONG).show();

                                    toastTextResId, Toast.LENGTH_LONG).show();

                        }

                        if (success) {

                            if (mFactoryReset) {
@@ -306,13 +313,13 @@ public class ExternalStorageFormatter extends Service 
                Log.w(TAG, "Unable to locate IMountService");

            }

        } else if (Environment.MEDIA_BAD_REMOVAL.equals(status)) {

            fail(R.string.media_bad_removal);

            fail(isUsbStorage ? R.string.usb_media_bad_removal : R.string.sd_media_bad_removal);

        } else if (Environment.MEDIA_CHECKING.equals(status)) {

            fail(R.string.media_checking);

            fail(isUsbStorage ? R.string.usb_media_checking : R.string.sd_media_checking);

        } else if (Environment.MEDIA_REMOVED.equals(status)) {

            fail(R.string.media_removed);

            fail(isUsbStorage ? R.string.usb_media_removed : R.string.sd_media_removed);

        } else if (Environment.MEDIA_SHARED.equals(status)) {

            fail(R.string.media_shared);

            fail(isUsbStorage ? R.string.usb_media_shared : R.string.sd_media_shared);

        } else {

            fail(R.string.media_unknown_state);

            Log.w(TAG, "Unknown storage state: " + status);

core/res/res/values/cm_strings.xml

+20 −2
Original line number Diff line number Diff line
@@ -271,7 +271,25 @@ 
    <string name="permdesc_preventpower">Allows an app to override the power key.</string>



    <!-- See EXTMEDIA_FORMAT.   This is the message. [CHAR LIMIT=NONE] -->

    <string name="extmedia_format_message_cm" product="nosdcard">All data on your USB storage (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

    <string name="usb_extmedia_format_message">All data on your USB storage (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

    <!-- See EXTMEDIA_FORMAT.   This is the message. -->

    <string name="extmedia_format_message_cm" product="default">All data on your card (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>

    <string name="sd_extmedia_format_message">All data on your card (under path \'%1$s\') will be erased. This action can\'t be reversed!</string>



    <!-- Strings for ExternalStorageFormatter service (SD card). -->

    <string name="sd_progress_unmounting">Unmounting SD card\u2026</string>

    <string name="sd_progress_erasing">Erasing SD card\u2026</string>

    <string name="sd_format_error">Couldn\'t erase SD card.</string>

    <string name="sd_media_bad_removal">SD card was removed before being unmounted.</string>

    <string name="sd_media_checking">SD card is currently being checked.</string>

    <string name="sd_media_removed">SD card has been removed.</string>

    <string name="sd_media_shared">SD card is currently in use by a computer.</string>



    <!-- Strings for ExternalStorageFormatter service (USB storage). -->

    <string name="usb_progress_unmounting">Unmounting USB storage\u2026</string>

    <string name="usb_progress_erasing">Erasing USB storage\u2026</string>

    <string name="usb_format_error">Couldn\'t erase USB storage.</string>

    <string name="usb_media_bad_removal">USB storage was removed before being unmounted.</string>

    <string name="usb_media_checking">USB storage is currently being checked.</string>

    <string name="usb_media_removed">USB storage has been removed.</string>

    <string name="usb_media_shared">USB storage is currently in use by a computer.</string>

</resources>

core/res/res/values/cm_symbols.xml

+22 −1
Original line number Diff line number Diff line
@@ -252,5 +252,26 @@ 
    <java-symbol type="string" name="storage_usb" />

    <java-symbol type="string" name="storage_uicc" />

    <java-symbol type="bool" name="config_batterySdCardAccessibility" />

    <java-symbol type="string" name="extmedia_format_message_cm" />



    <!-- External media format -->

    <java-symbol type="string" name="usb_extmedia_format_message" />

    <java-symbol type="string" name="sd_extmedia_format_message" />



    <!-- Strings for ExternalStorageFormatter service (SD card). -->

    <java-symbol type="string" name="sd_progress_unmounting" />

    <java-symbol type="string" name="sd_progress_erasing" />

    <java-symbol type="string" name="sd_format_error" />

    <java-symbol type="string" name="sd_media_bad_removal" />

    <java-symbol type="string" name="sd_media_checking" />

    <java-symbol type="string" name="sd_media_removed" />

    <java-symbol type="string" name="sd_media_shared" />



    <!-- Strings for ExternalStorageFormatter service (USB storage). -->

    <java-symbol type="string" name="usb_progress_unmounting" />

    <java-symbol type="string" name="usb_progress_erasing" />

    <java-symbol type="string" name="usb_format_error" />

    <java-symbol type="string" name="usb_media_bad_removal" />

    <java-symbol type="string" name="usb_media_checking" />

    <java-symbol type="string" name="usb_media_removed" />

    <java-symbol type="string" name="usb_media_shared" />

</resources>