diff options
| author | 2025-03-25 09:34:19 -0700 | |
|---|---|---|
| committer | 2025-03-28 18:54:44 -0700 | |
| commit | 971707c40b50a6e60ddf01ee50bcd5aa86462e53 (patch) | |
| tree | 023425dbea8b7c87858c93752b11a69728c4e1df | |
| parent | 7f4a0e24be88dc687beb57b59cfa94b0079cec8c (diff) | |
Using the same string "App List" for Long press menu and Talkback
Bug: 386737601
Test: OptionsPopupTest
Flag: EXEMPT BUGFIX
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0fbd6301493c4bd42811ccf09f38ad95eeb57dfe)
Merged-In: I20e5a89ee46389e6ce059f27041b5bd1a7224410
Change-Id: I20e5a89ee46389e6ce059f27041b5bd1a7224410
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/AccessibilityActionsView.java | 5 | ||||
| -rw-r--r-- | src/com/android/launcher3/views/OptionsPopupView.java | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f0578cd16e..6c980c4751 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -324,8 +324,6 @@ <string name="edit_home_screen">Edit Home Screen</string> <!-- Text for settings button [CHAR LIMIT=20]--> <string name="settings_button_text">Home settings</string> - <!-- Text for app menu button [CHAR LIMIT=30]--> - <string name="all_apps_home_screen">Apps</string> <!-- Message shown when a feature is disabled by the administrator --> <string name="msg_disabled_by_admin">Disabled by your admin</string> diff --git a/src/com/android/launcher3/views/AccessibilityActionsView.java b/src/com/android/launcher3/views/AccessibilityActionsView.java index fcb7c282ee..a1e118d2a4 100644 --- a/src/com/android/launcher3/views/AccessibilityActionsView.java +++ b/src/com/android/launcher3/views/AccessibilityActionsView.java @@ -63,10 +63,7 @@ public class AccessibilityActionsView extends View implements StateListener<Laun @Override public AccessibilityNodeInfo createAccessibilityNodeInfo() { AccessibilityNodeInfo info = super.createAccessibilityNodeInfo(); - Launcher l = Launcher.getLauncher(getContext()); - info.addAction(new AccessibilityAction( - R.string.all_apps_button_label, l.getText(R.string.all_apps_button_label))); - for (OptionItem item : OptionsPopupView.getOptions(l)) { + for (OptionItem item : OptionsPopupView.getOptions(Launcher.getLauncher(getContext()))) { info.addAction(new AccessibilityAction(item.labelRes, item.label)); } return info; diff --git a/src/com/android/launcher3/views/OptionsPopupView.java b/src/com/android/launcher3/views/OptionsPopupView.java index 8c01c5999f..02b770e62d 100644 --- a/src/com/android/launcher3/views/OptionsPopupView.java +++ b/src/com/android/launcher3/views/OptionsPopupView.java @@ -220,7 +220,7 @@ public class OptionsPopupView<T extends Context & ActivityContext> extends Arrow OptionsPopupView::enterHomeGardening)); } options.add(new OptionItem(launcher, - R.string.all_apps_home_screen, + R.string.all_apps_button_label, R.drawable.ic_apps, LAUNCHER_ALL_APPS_TAP_OR_LONGPRESS, OptionsPopupView::enterAllApps)); |