diff options
| author | 2020-06-23 15:12:41 +0000 | |
|---|---|---|
| committer | 2020-06-23 15:12:41 +0000 | |
| commit | f8d3c259f28524e12b2c08b119b9f53fbee4e583 (patch) | |
| tree | 808c726deda49f975e10867f0a74c5f61b678aee | |
| parent | 5a192ad6ad0be26ab4bf701695b0824d3f14f9cf (diff) | |
| parent | 22033975dc3e3febda88d50631b8105dcd47bcad (diff) | |
Merge "Remove 'on phone' from strings" into rvc-dev
| -rw-r--r-- | res/values/strings.xml | 10 | ||||
| -rw-r--r-- | src/com/android/documentsui/BaseActivity.java | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 10576e750..088e67266 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] --> diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java index 672312d8b..8c0d9693f 100644 --- a/src/com/android/documentsui/BaseActivity.java +++ b/src/com/android/documentsui/BaseActivity.java @@ -731,7 +731,7 @@ public abstract class BaseActivity 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(); |