diff options
| -rw-r--r-- | core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java | 4 | ||||
| -rw-r--r-- | core/res/res/layout/accessibility_button_chooser_item.xml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java b/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java index 82eb55a30a4e..5f35622cad51 100644 --- a/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java +++ b/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java @@ -471,6 +471,7 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mSwitchItem.setVisibility(View.GONE); holder.mItemContainer.setVisibility(isLaunchMenuMode ? View.GONE : View.VISIBLE); holder.mItemView.setEnabled(enabledState); + holder.mItemView.setClickable(!enabledState); } private void updateInvisibleActionItemVisibility(@NonNull Context context, @@ -485,6 +486,7 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mItemContainer.setVisibility((mShortcutMenuMode == ShortcutMenuMode.EDIT) ? View.VISIBLE : View.GONE); holder.mItemView.setEnabled(true); + holder.mItemView.setClickable(false); } private void updateIntuitiveActionItemVisibility(@NonNull Context context, @@ -504,6 +506,7 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mSwitchItem.setChecked(!isEditMenuMode && isServiceEnabled); holder.mItemContainer.setVisibility(View.VISIBLE); holder.mItemView.setEnabled(true); + holder.mItemView.setClickable(false); } private void updateBounceActionItemVisibility(@NonNull Context context, @@ -518,6 +521,7 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mSwitchItem.setVisibility(View.GONE); holder.mItemContainer.setVisibility(View.VISIBLE); holder.mItemView.setEnabled(true); + holder.mItemView.setClickable(false); } } diff --git a/core/res/res/layout/accessibility_button_chooser_item.xml b/core/res/res/layout/accessibility_button_chooser_item.xml index d6fd7aa30e6e..d19e313055ae 100644 --- a/core/res/res/layout/accessibility_button_chooser_item.xml +++ b/core/res/res/layout/accessibility_button_chooser_item.xml @@ -20,7 +20,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:clickable="true" android:gravity="center" android:paddingStart="16dp" android:paddingEnd="16dp" |