Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73842240 authored by Peter_Liang's avatar Peter_Liang
Browse files

Fix the accessibility event for clicking disabled item. 

Root cause: shouldn't speak "Double tap to activate" for disabled item.
Goal: set disable for the item.

Bug: 148834576
Test: manual test
Change-Id: I40a083ec4f7d18073dd46636719d6b64fb674f67
parent 6629e1ce

core/java/com/android/internal/app/AccessibilityButtonChooserActivity.java

+20 −14
Original line number Diff line number Diff line
@@ -354,10 +354,11 @@ public class AccessibilityButtonChooserActivity extends Activity { 
    }



    private static class ViewHolder {

        View mItemView;

        ImageView mIconView;

        TextView mLabelView;

        FrameLayout mItemContainer;

        ImageView mViewItem;

        ImageView mActionViewItem;

        Switch mSwitchItem;

    }
@@ -407,12 +408,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);
@@ -465,11 +467,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,
@@ -477,12 +480,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,
@@ -495,12 +499,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,
@@ -508,12 +513,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);

        }

    }