summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author Sebastian Franco <fransebas@google.com> 2025-03-25 09:34:19 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2025-03-28 18:54:44 -0700
commit971707c40b50a6e60ddf01ee50bcd5aa86462e53 (patch)
tree023425dbea8b7c87858c93752b11a69728c4e1df /src
parent7f4a0e24be88dc687beb57b59cfa94b0079cec8c (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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/views/AccessibilityActionsView.java5
-rw-r--r--src/com/android/launcher3/views/OptionsPopupView.java2
2 files changed, 2 insertions, 5 deletions
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));