diff options
| author | 2020-06-24 16:43:36 +0000 | |
|---|---|---|
| committer | 2020-06-24 16:43:36 +0000 | |
| commit | d0de34ea9e56b12a3d034785c6a7ac04f5c92fda (patch) | |
| tree | a2b3edc99c03edfbee000e33b0a19adc8233afc2 | |
| parent | eb1d2b526ae94c65c343127d9633dfd0594813ec (diff) | |
| parent | ebc86a071721bb2711167c00afbe3ce40aa84dc7 (diff) | |
Merge "Add string for "See more apps"" into rvc-dev am: 11e7231a75 am: ebc86a0717
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987678
Change-Id: I1b601b0562c769bb21279017efb313f12531279d
| -rw-r--r-- | packages/SystemUI/res/layout/controls_management.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 3 |
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] --> |