From eb215c0d331857578cc2dd249931d21870c44f5a Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 27 Nov 2018 16:35:39 +0000
Subject: [PATCH] Rephrase progress_erasing to be generic

Re-phrase this string not to refer to the specific type of storage
the device has (e.g. "sd card" or "usb storage"). It seems the
implementation is looping through various disks anyway, so it's
unlikely to always be correct. Also, the way this was achieved
was by compiling the resources differently depending on the device.
Eliminate these strings to make the framework resources generic.

Bug: 118618261
Test: make
Change-Id: Id3ef16bb1c2bf8bac24f626d3cc0ac69b2d73eb7
---
 core/res/res/values/strings.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 9204ee438aa5e..af291c369cccc 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -3873,10 +3873,8 @@
     <string name="action_mode_done">Done</string>
 
     <!-- Strings for MasterClearReceiver. -->
-    <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
-    <string name="progress_erasing" product="nosdcard">Erasing USB storage\u2026</string>
-    <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
-    <string name="progress_erasing" product="default">Erasing SD card\u2026</string>
+    <!-- Text for progress dialog while erasing the shared storage volume [CHAR LIMIT=NONE] -->
+    <string name="progress_erasing">Erasing shared storage\u2026</string>
 
     <!-- Text for WebView's text selection Action Mode -->
     <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->