summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pietal <mpietal@google.com> 2019-04-30 07:59:14 -0400
committer Matt Pietal <mpietal@google.com> 2019-04-30 07:59:14 -0400
commit8a8cfc46caf223dced2103e793b436886deb2e3f (patch)
tree07f64b2c8ef042ebbdd7cb474c03fd85d501305a
parent46669aa717754cfd125da043eac71a9332ad5658 (diff)
Sharesheet - Talkback fixes
Disable the content preview area so it is not clickable. Do not make the drag handle clickable. Bug: 131121700 Test: Use Talkback on Sharesheet Change-Id: Iad60eae8f2b69a7680914cff88a6902a1246364f
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java14
-rw-r--r--core/res/res/layout/chooser_grid.xml3
2 files changed, 15 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 204012f04cba..0edf5619082d 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2550,6 +2550,20 @@ public class ChooserActivity extends ResolverActivity {
}
@Override
+ public boolean areAllItemsEnabled() {
+ return false;
+ }
+
+ @Override
+ public boolean isEnabled(int position) {
+ int viewType = getItemViewType(position);
+ if (viewType == VIEW_TYPE_CONTENT_PREVIEW) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
public int getCount() {
return (int) (
getContentPreviewRowCount()
diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml
index 8727f4c9e0ef..99053600f8e7 100644
--- a/core/res/res/layout/chooser_grid.xml
+++ b/core/res/res/layout/chooser_grid.xml
@@ -37,8 +37,8 @@
android:layout_width="24dp"
android:layout_height="4dp"
android:src="@drawable/ic_drag_handle"
- android:clickable="true"
android:layout_marginTop="@dimen/chooser_edge_margin_thin"
+ android:layout_marginBottom="@dimen/chooser_edge_margin_thin"
android:tint="@color/lighter_gray"
android:layout_centerHorizontal="true"
android:layout_alignParentTop="true" />
@@ -50,7 +50,6 @@
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:gravity="center"
- android:paddingTop="@dimen/chooser_edge_margin_thin"
android:paddingBottom="@dimen/chooser_view_spacing"
android:paddingLeft="24dp"
android:paddingRight="24dp"