summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-24 16:29:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-24 16:29:32 +0000
commitd1c483609c653bb1b741aa6be9ff061fc96d2a87 (patch)
tree1a0e7964c817b4398258c36e87c1b325bcdaa7be
parente71ed27853afa9369335f4170bd2782b2ac843f2 (diff)
parent11e7231a75668364d3ad088c2c13b3ed319a6c14 (diff)
Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678 Change-Id: If3bffe9d106c25241fcb3a790b659f0f8622ce2b
-rw-r--r--packages/SystemUI/res/layout/controls_management.xml2
-rw-r--r--packages/SystemUI/res/values/strings.xml3
2 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/res/layout/controls_management.xml b/packages/SystemUI/res/layout/controls_management.xml
index 46f79deff109..ae7f44d19430 100644
--- a/packages/SystemUI/res/layout/controls_management.xml
+++ b/packages/SystemUI/res/layout/controls_management.xml
@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:text="See other apps"
+ android:text="@string/controls_favorite_see_other_apps"
style="@*android:style/Widget.DeviceDefault.Button.Borderless.Colored"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 0e3fa1e48695..db45a60ab7c0 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -2744,6 +2744,9 @@
<!-- Controls management favorites screen, See other apps with changes made [CHAR LIMIT=NONE] -->
<string name="controls_favorite_toast_no_changes">Changes not saved</string>
+ <!-- Controls management favorites screen. See other apps button [CHAR LIMIT=30] -->
+ <string name="controls_favorite_see_other_apps">See other apps</string>
+
<!-- Controls management controls screen error on load message [CHAR LIMIT=NONE] -->
<string name="controls_favorite_load_error">Controls could not be loaded. Check the <xliff:g id="app" example="System UI">%s</xliff:g> app to make sure that the app settings haven\u2019t changed.</string>
<!-- Controls management controls screen no controls found on load message [CHAR LIMIT=NONE] -->