PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Dismiss action in Talkback Local Context Menu" into rvc-dev am: 78ad874157 am: 98db0709e7

Browse Source 
Change-Id: I9aba4488661208189a9dd5b3d36ac57ca9fff2d7
This commit is contained in:
TreeHugger Robot
2020-04-14 09:18:19 +00:00
committed by Automerger Merge Worker
parent eab00379c2 98db0709e7
commit 323b51e879
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
View File

@@ -21,6 +21,7 @@ import static android.app.slice.Slice.HINT_ERROR;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log;
@@ -29,6 +30,9 @@ import android.widget.Button;
import androidx.annotation.LayoutRes;
import androidx.annotation.VisibleForTesting;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
@@ -167,6 +171,27 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, Life
resetCardView(holder);
mSliceLiveDataMap.get(card.getSliceUri()).removeObservers(mLifecycleOwner);
});
ViewCompat.setAccessibilityDelegate(getInitialView(holder),
new AccessibilityDelegateCompat() {
@Override
public void onInitializeAccessibilityNodeInfo(View host,
AccessibilityNodeInfoCompat info) {
super.onInitializeAccessibilityNodeInfo(host, info);
info.addAction(AccessibilityNodeInfoCompat.ACTION_DISMISS);
info.setDismissable(true);
}
@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
if (action == AccessibilityNodeInfoCompat.ACTION_DISMISS) {
mControllerRendererPool.getController(mContext,
card.getCardType()).onDismissed(card);
}
return super.performAccessibilityAction(host, action, args);
}
});
}
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)