Don't call setAccessibilityPaneTitle when device is not at least Android 9 (#5603)

* Update WidgetsTwoPaneSheet.java

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>

* Update PopupContainerWithArrow.java

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>

* Update SplitInstructionsView.java

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>

* Update TaskbarView.java

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>

---------

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>
This commit is contained in:
Pun Butrach
2025-07-14 13:19:58 +07:00
committed by GitHub
parent 1a4289ea70
commit 2fcaf0a5ec
4 changed files with 14 additions and 6 deletions

View File

@@ -280,9 +280,10 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
}
protected void init(TaskbarViewCallbacks callbacks) {
// set taskbar pane title so that accessibility service know it window and
// focuses.
setAccessibilityPaneTitle(getContext().getString(R.string.taskbar_a11y_title));
if (Utilities.ATLEAST_P) {
// set taskbar pane title so that accessibility service know it window and focuses.
setAccessibilityPaneTitle(getContext().getString(R.string.taskbar_a11y_title));
}
mControllerCallbacks = callbacks;
mIconClickListener = mControllerCallbacks.getIconOnClickListener();
mIconLongClickListener = mControllerCallbacks.getIconOnLongClickListener();

View File

@@ -158,7 +158,9 @@ public class SplitInstructionsView extends LinearLayout {
}
// Set accessibility title, will be announced by a11y tools.
instructionTextView.setAccessibilityPaneTitle(instructionTextView.getText());
if (Utilities.ATLEAST_P) {
instructionTextView.setAccessibilityPaneTitle(instructionTextView.getText());
}
}
private void exitSplitSelection() {

View File

@@ -48,6 +48,7 @@ import com.android.launcher3.DropTarget.DragObject;
import com.android.launcher3.Flags;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
import com.android.launcher3.accessibility.ShortcutMenuAccessibilityDelegate;
import com.android.launcher3.dragndrop.DragController;
@@ -254,7 +255,9 @@ public class PopupContainerWithArrow<T extends Context & ActivityContext>
* Animates and loads shortcuts on background thread for this popup container
*/
private void loadAppShortcuts(ItemInfo originalItemInfo) {
setAccessibilityPaneTitle(getTitleForAccessibility());
if (Utilities.ATLEAST_P) {
setAccessibilityPaneTitle(getTitleForAccessibility());
}
mOriginalIcon.setForceHideDot(true);
// All views are added. Animate layout from now on.
setLayoutTransition(new LayoutTransition());

View File

@@ -281,7 +281,9 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet {
mRightPane.removeAllViews();
mRightPane.addView(mWidgetRecommendationsContainer);
mRightPaneScrollView.setScrollY(0);
mRightPane.setAccessibilityPaneTitle(suggestionsRightPaneTitle);
if (Utilities.ATLEAST_P) {
mRightPane.setAccessibilityPaneTitle(suggestionsRightPaneTitle);
}
mSuggestedWidgetsPackageUserKey = PackageUserKey.fromPackageItemInfo(packageItemInfo);
final boolean isChangingHeaders = mSelectedHeader == null
|| !mSelectedHeader.equals(mSuggestedWidgetsPackageUserKey);