Merge "Preventing widget preview from getting accessibility focus on internal content" into tm-dev am: f27d6c0dc7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198385

Change-Id: I732eff02b330a7086b2bdef92d2d6c22904322e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sunny Goyal
2022-05-06 22:19:45 +00:00
committed by Automerger Merge Worker
3 changed files with 7 additions and 7 deletions

View File

@@ -22,7 +22,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"
android:importantForAccessibility="no"
android:importantForAccessibility="noHideDescendants"
android:layout_marginVertical="8dp">
<!-- The image of the widget. This view does not support padding. Any placement adjustment
should be done using margins. Width & height are set at runtime after scaling the

View File

@@ -21,7 +21,10 @@
android:layout_height="wrap_content"
android:paddingVertical="@dimen/widget_list_header_view_vertical_padding"
android:orientation="horizontal"
launcher:appIconSize="48dp">
android:importantForAccessibility="yes"
android:focusable="true"
launcher:appIconSize="48dp"
android:descendantFocusability="afterDescendants">
<ImageView
android:id="@+id/app_icon"
@@ -32,14 +35,11 @@
tools:src="@drawable/ic_corp"/>
<LinearLayout
android:id="@+id/app_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical"
android:focusable="true"
android:descendantFocusability="afterDescendants">
android:orientation="vertical">
<TextView
android:id="@+id/app_title"

View File

@@ -95,7 +95,7 @@ public final class WidgetsListHeader extends LinearLayout implements ItemInfoUpd
mTitle = findViewById(R.id.app_title);
mSubtitle = findViewById(R.id.app_subtitle);
mExpandToggle = findViewById(R.id.toggle);
findViewById(R.id.app_container).setAccessibilityDelegate(new AccessibilityDelegate() {
setAccessibilityDelegate(new AccessibilityDelegate() {
@Override
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {