diff options
| -rw-r--r-- | core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java b/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java index 8639cac29e2d..82eb55a30a4e 100644 --- a/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java +++ b/core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java @@ -352,10 +352,11 @@ public class AccessibilityButtonChooserActivity extends Activity { } private static class ViewHolder { + View mItemView; ImageView mIconView; TextView mLabelView; FrameLayout mItemContainer; - ImageView mViewItem; + ImageView mActionViewItem; Switch mSwitchItem; } @@ -405,12 +406,13 @@ public class AccessibilityButtonChooserActivity extends Activity { R.layout.accessibility_button_chooser_item, parent, /* attachToRoot= */ false); holder = new ViewHolder(); + holder.mItemView = convertView; holder.mIconView = convertView.findViewById(R.id.accessibility_button_target_icon); holder.mLabelView = convertView.findViewById( R.id.accessibility_button_target_label); holder.mItemContainer = convertView.findViewById( R.id.accessibility_button_target_item_container); - holder.mViewItem = convertView.findViewById( + holder.mActionViewItem = convertView.findViewById( R.id.accessibility_button_target_view_item); holder.mSwitchItem = convertView.findViewById( R.id.accessibility_button_target_switch_item); @@ -463,11 +465,12 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mIconView.setAlpha(enabledState ? ENABLED_ALPHA : DISABLED_ALPHA); holder.mLabelView.setEnabled(enabledState); - holder.mViewItem.setEnabled(enabledState); - holder.mViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); - holder.mViewItem.setVisibility(View.VISIBLE); + holder.mActionViewItem.setEnabled(enabledState); + holder.mActionViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); + holder.mActionViewItem.setVisibility(View.VISIBLE); holder.mSwitchItem.setVisibility(View.GONE); holder.mItemContainer.setVisibility(isLaunchMenuMode ? View.GONE : View.VISIBLE); + holder.mItemView.setEnabled(enabledState); } private void updateInvisibleActionItemVisibility(@NonNull Context context, @@ -475,12 +478,13 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mIconView.setColorFilter(null); holder.mIconView.setAlpha(ENABLED_ALPHA); holder.mLabelView.setEnabled(true); - holder.mViewItem.setEnabled(true); - holder.mViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); - holder.mViewItem.setVisibility(View.VISIBLE); + holder.mActionViewItem.setEnabled(true); + holder.mActionViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); + holder.mActionViewItem.setVisibility(View.VISIBLE); holder.mSwitchItem.setVisibility(View.GONE); holder.mItemContainer.setVisibility((mShortcutMenuMode == ShortcutMenuMode.EDIT) ? View.VISIBLE : View.GONE); + holder.mItemView.setEnabled(true); } private void updateIntuitiveActionItemVisibility(@NonNull Context context, @@ -493,12 +497,13 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mIconView.setColorFilter(null); holder.mIconView.setAlpha(ENABLED_ALPHA); holder.mLabelView.setEnabled(true); - holder.mViewItem.setEnabled(true); - holder.mViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); - holder.mViewItem.setVisibility(isEditMenuMode ? View.VISIBLE : View.GONE); + holder.mActionViewItem.setEnabled(true); + holder.mActionViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); + holder.mActionViewItem.setVisibility(isEditMenuMode ? View.VISIBLE : View.GONE); holder.mSwitchItem.setVisibility(isEditMenuMode ? View.GONE : View.VISIBLE); holder.mSwitchItem.setChecked(!isEditMenuMode && isServiceEnabled); holder.mItemContainer.setVisibility(View.VISIBLE); + holder.mItemView.setEnabled(true); } private void updateBounceActionItemVisibility(@NonNull Context context, @@ -506,12 +511,13 @@ public class AccessibilityButtonChooserActivity extends Activity { holder.mIconView.setColorFilter(null); holder.mIconView.setAlpha(ENABLED_ALPHA); holder.mLabelView.setEnabled(true); - holder.mViewItem.setEnabled(true); - holder.mViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); - holder.mViewItem.setVisibility((mShortcutMenuMode == ShortcutMenuMode.EDIT) + holder.mActionViewItem.setEnabled(true); + holder.mActionViewItem.setImageDrawable(context.getDrawable(R.drawable.ic_delete_item)); + holder.mActionViewItem.setVisibility((mShortcutMenuMode == ShortcutMenuMode.EDIT) ? View.VISIBLE : View.GONE); holder.mSwitchItem.setVisibility(View.GONE); holder.mItemContainer.setVisibility(View.VISIBLE); + holder.mItemView.setEnabled(true); } } |