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

Commit 5fc24733 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

New strings! 

Bug: 21737573, 21666225, 21756698, 21737666, 21471429
Change-Id: If1c5882d48f798d311f6d2b86277d3c13f06824e
parent f198b96d

core/java/android/os/storage/VolumeInfo.java

+17 −0
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.DebugUtils;

import android.util.SparseArray;

import android.util.SparseIntArray;



import com.android.internal.R;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;
@@ -80,6 +82,7 @@ public class VolumeInfo implements Parcelable { 


    private static SparseArray<String> sStateToEnvironment = new SparseArray<>();

    private static ArrayMap<String, String> sEnvironmentToBroadcast = new ArrayMap<>();

    private static SparseIntArray sStateToDescrip = new SparseIntArray();



    private static final Comparator<VolumeInfo>

            sDescriptionComparator = new Comparator<VolumeInfo>() {
@@ -116,6 +119,16 @@ public class VolumeInfo implements Parcelable { 
        sEnvironmentToBroadcast.put(Environment.MEDIA_UNMOUNTABLE, Intent.ACTION_MEDIA_UNMOUNTABLE);

        sEnvironmentToBroadcast.put(Environment.MEDIA_REMOVED, Intent.ACTION_MEDIA_REMOVED);

        sEnvironmentToBroadcast.put(Environment.MEDIA_BAD_REMOVAL, Intent.ACTION_MEDIA_BAD_REMOVAL);



        sStateToDescrip.put(VolumeInfo.STATE_UNMOUNTED, R.string.ext_media_status_unmounted);

        sStateToDescrip.put(VolumeInfo.STATE_CHECKING, R.string.ext_media_status_checking);

        sStateToDescrip.put(VolumeInfo.STATE_MOUNTED, R.string.ext_media_status_mounted);

        sStateToDescrip.put(VolumeInfo.STATE_MOUNTED_READ_ONLY, R.string.ext_media_status_mounted_ro);

        sStateToDescrip.put(VolumeInfo.STATE_FORMATTING, R.string.ext_media_status_formatting);

        sStateToDescrip.put(VolumeInfo.STATE_EJECTING, R.string.ext_media_status_ejecting);

        sStateToDescrip.put(VolumeInfo.STATE_UNMOUNTABLE, R.string.ext_media_status_unmountable);

        sStateToDescrip.put(VolumeInfo.STATE_REMOVED, R.string.ext_media_status_removed);

        sStateToDescrip.put(VolumeInfo.STATE_BAD_REMOVAL, R.string.ext_media_status_bad_removal);

    }



    /** vold state */
@@ -201,6 +214,10 @@ public class VolumeInfo implements Parcelable { 
        return state;

    }



    public int getStateDescription() {

        return sStateToDescrip.get(state, 0);

    }



    public @Nullable String getFsUuid() {

        return fsUuid;

    }

core/res/res/values/strings.xml

+31 −3
Original line number Diff line number Diff line
@@ -3028,9 +3028,14 @@ 
    <string name="ext_media_ready_notification_message">For transferring photos and media</string>



    <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->

    <string name="ext_media_unmountable_notification_title">Damaged <xliff:g id="name" example="SD card">%s</xliff:g></string>

    <string name="ext_media_unmountable_notification_title">Corrupted <xliff:g id="name" example="SD card">%s</xliff:g></string>

    <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->

    <string name="ext_media_unmountable_notification_message"><xliff:g id="name" example="SD card">%s</xliff:g> is damaged; try reformatting it</string>

    <string name="ext_media_unmountable_notification_message"><xliff:g id="name" example="SD card">%s</xliff:g> is corrupt. Touch to fix.</string>



    <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->

    <string name="ext_media_unsupported_notification_title">Unsupported <xliff:g id="name" example="SD card">%s</xliff:g></string>

    <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->

    <string name="ext_media_unsupported_notification_message">This device doesn\u2019t support this <xliff:g id="name" example="SD card">%s</xliff:g>. Touch to set up in a supported format.</string>



    <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->

    <string name="ext_media_badremoval_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> unexpectedly removed</string>
@@ -3074,6 +3079,29 @@ 
    <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->

    <string name="ext_media_move_failure_message">Data left at original location</string>



    <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->

    <string name="ext_media_status_removed">Removed</string>

    <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->

    <string name="ext_media_status_unmounted">Ejected</string>

    <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->

    <string name="ext_media_status_checking">Checking\u2026</string>

    <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->

    <string name="ext_media_status_mounted">Ready</string>

    <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->

    <string name="ext_media_status_mounted_ro">Read-only</string>

    <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->

    <string name="ext_media_status_bad_removal">Removed unsafely</string>

    <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->

    <string name="ext_media_status_unmountable">Corrupted</string>

    <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->

    <string name="ext_media_status_unsupported">Unsupported</string>

    <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->

    <string name="ext_media_status_ejecting">Ejecting\u2026</string>

    <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->

    <string name="ext_media_status_formatting">Formatting\u2026</string>

    <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->

    <string name="ext_media_status_missing">Not inserted</string>



    <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->

    <string name="activity_list_empty">No matching activities found.</string>

core/res/res/values/symbols.xml

+15 −0
Original line number Diff line number Diff line
@@ -2291,5 +2291,20 @@ 
  <java-symbol type="string" name="config_radio_access_family" />

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

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



  <java-symbol type="attr" name="seekBarDialogPreferenceStyle" />

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

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

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

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

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

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

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

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

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

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

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

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

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



</resources>

packages/DocumentsUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
    <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->

    <string name="menu_delete">Delete</string>

    <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->

    <string name="menu_select_all">Select All</string>

    <string name="menu_select_all">Select all</string>

    <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->

    <string name="menu_copy">Copy to\u2026</string>