commit e141612443f23f704054e0d1834f974acc117526
author Diksha Gohlyan <dikshag@google.com> Tue Jun 23 15:38:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 23 15:38:21 2020 +0000
tree 3946a1062e33217cf09f2fead14838198bbf27c1
parent 39006f6f5899837c1c0898fa2566f7200b4a591f
parent ef87deba7a1ce63c7f3042dec28a2bb41a2f23d9

Merge "Remove 'on phone' from strings" into rvc-dev am: f8d3c259f2 am: ef87deba7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DocumentsUI/+/11940694

Change-Id: I6d683212b90f035de76d1a661063f3a5b671f11b

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 10576e7..088e672 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -452,11 +452,9 @@
     </plurals>
 
     <!-- Header title for list of documents in recent root. [CHAR_LIMIT=60] -->
-    <string name="root_info_header_recent">Recent files on phone</string>
+    <string name="root_info_header_recent">Recent files</string>
     <!-- Header title for list of documents in global searching. [CHAR_LIMIT=60] -->
-    <string name="root_info_header_global_search">Files on phone</string>
-    <!-- Header title for list of documents in media type root. [CHAR_LIMIT=60] -->
-    <string name="root_info_header_media"><xliff:g id="label" example="images">%1$s</xliff:g> on phone</string>
+    <string name="root_info_header_global_search">Files</string>
     <!-- Header title for list of documents in downloads root. [CHAR_LIMIT=60] -->
     <string name="root_info_header_downloads">Files in Downloads</string>
     <!-- Header title for list of documents in storage type root. [CHAR_LIMIT=60] -->
@@ -468,9 +466,9 @@
     <!-- Header title for list of documents 3rd party provider root eg. Drive, Box. with root summary. The summary is usually present by email account[CHAR_LIMIT=60] -->
     <string name="root_info_header_app_with_summary">Files from <xliff:g id="label" example="Drive">%1$s</xliff:g> / <xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
     <!-- On photo picking state, the header title for list of documents in recent root. [CHAR_LIMIT=60] -->
-    <string name="root_info_header_image_recent">Recent images on phone</string>
+    <string name="root_info_header_image_recent">Recent images</string>
     <!-- On photo picking state, the header title for list of documents in global searching. [CHAR_LIMIT=60] -->
-    <string name="root_info_header_image_global_search">Images on phone</string>
+    <string name="root_info_header_image_global_search">Images</string>
     <!-- On photo picking state, the header title for list of documents in downloads root. [CHAR_LIMIT=60] -->
     <string name="root_info_header_image_downloads">Images in Downloads</string>
     <!-- On photo picking state, the header title for list of documents in storage type root. [CHAR_LIMIT=60] -->

src/com/android/documentsui/BaseActivity.java

diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index 672312d..8c0d969 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -731,7 +731,7 @@
             case RootInfo.TYPE_IMAGES:
             case RootInfo.TYPE_VIDEO:
             case RootInfo.TYPE_AUDIO:
-                result = getString(R.string.root_info_header_media, rootTitle);
+                result = rootTitle;
                 break;
             case RootInfo.TYPE_DOWNLOADS:
                 result = getHeaderDownloadsTitle();