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

Commit 756c8c3f authored by Victor Chang's avatar Victor Chang
Browse files

Remove the *byteShort string resources from the frameworks 

The "byteShort" is still kept because ICU's version is too long for this
use case.

This commit is separated to unblock the previous commit which removed
the usage of these strings.

Bug: 36994779
Bug: 71580745
Bug: 217592956
Test: m droid
Change-Id: I1833bd357860841037aa323cdf6acf9366b6ca1e
parent 988cb5a3

boot/hiddenapi/hiddenapi-max-target-q.txt

+0 −5
Original line number Diff line number Diff line
@@ -404,16 +404,11 @@ Lcom/android/internal/R$raw;->nodomain:I 
Lcom/android/internal/R$string;->byteShort:I

Lcom/android/internal/R$string;->cancel:I

Lcom/android/internal/R$string;->enable_explore_by_touch_warning_title:I

Lcom/android/internal/R$string;->gigabyteShort:I

Lcom/android/internal/R$string;->kilobyteShort:I

Lcom/android/internal/R$string;->megabyteShort:I

Lcom/android/internal/R$string;->notification_title:I

Lcom/android/internal/R$string;->no_matches:I

Lcom/android/internal/R$string;->ok:I

Lcom/android/internal/R$string;->petabyteShort:I

Lcom/android/internal/R$string;->redo:I

Lcom/android/internal/R$string;->share:I

Lcom/android/internal/R$string;->terabyteShort:I

Lcom/android/internal/R$string;->whichApplication:I

Lcom/android/internal/R$style;->Animation_DropDownDown:I

Lcom/android/internal/R$style;->Animation_DropDownUp:I

core/res/res/values/strings.xml

+5 −17
Original line number Diff line number Diff line
@@ -20,23 +20,11 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Suffix added to a number to signify size in bytes. -->

    <string name="byteShort">B</string>

    <!-- Suffix added to a number to signify size in kilobytes (1000 bytes).

        If you retain the Latin script for the localization, please use the lowercase

        'k', as it signifies 1000 bytes as opposed to 1024 bytes. -->

    <string name="kilobyteShort">kB</string>

    <!-- Suffix added to a number to signify size in megabytes. -->

    <string name="megabyteShort">MB</string>

    <!-- Suffix added to a number to signify size in gigabytes. -->

    <string name="gigabyteShort">GB</string>

    <!-- Suffix added to a number to signify size in terabytes. -->

    <string name="terabyteShort">TB</string>

    <!-- Suffix added to a number to signify size in petabytes. -->

    <string name="petabyteShort">PB</string>

    <!-- Format string used to add a suffix like "kB" or "MB" to a number

         to display a size in kilobytes, megabytes, or other size units.

         Some languages (like French) will want to add a space between

         the placeholders. -->

    <string name="fileSizeSuffix"><xliff:g id="number" example="123">%1$s</xliff:g> <xliff:g id="unit" example="MB">%2$s</xliff:g></string>

    <!-- Format string used to add a suffix like "B" to a number

         to display a size in bytes.

         Some languages may want to remove the space between the placeholders

         or replace it with a non-breaking space. -->

    <string name="fileSizeSuffix"><xliff:g id="number" example="123">%1$s</xliff:g> <xliff:g id="unit" example="B">%2$s</xliff:g></string>



    <!-- Used in Contacts for a field that has no label and in Note Pad

         for a note with no name. -->

core/res/res/values/symbols.xml

+0 −5
Original line number Diff line number Diff line
@@ -737,7 +737,6 @@ 
  <java-symbol type="string" name="fileSizeSuffix" />

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

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

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

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

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

  <java-symbol type="string" name="gpsNotifTitle" />
@@ -793,7 +792,6 @@ 
  <java-symbol type="string" name="keyboardview_keycode_enter" />

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

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

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

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

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

  <java-symbol type="string" name="lock_to_app_unlock_pin" />
@@ -810,7 +808,6 @@ 
  <java-symbol type="string" name="lockscreen_emergency_call" />

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

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

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

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

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

  <java-symbol type="string" name="mmiComplete" />
@@ -840,7 +837,6 @@ 
  <java-symbol type="string" name="passwordIncorrect" />

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

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

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

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

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

  <java-symbol type="string" name="peerTtyModeVco" />
@@ -1016,7 +1012,6 @@ 
  <java-symbol type="string" name="sync_really_delete" />

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

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

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

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

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

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