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

Commit 5feb0ad1 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Use MULTI_LINE and OPENS_POPUP accessibility properties" into klp-dev

parents f6121f38 058ac7cf

core/java/android/widget/ActivityChooserView.java

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.View; 
import android.view.ViewGroup;

import android.view.ViewTreeObserver;

import android.view.ViewTreeObserver.OnGlobalLayoutListener;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.ActivityChooserModel.ActivityChooserModelClient;



/**
@@ -229,6 +230,13 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 


        mExpandActivityOverflowButton = (FrameLayout) findViewById(R.id.expand_activities_button);

        mExpandActivityOverflowButton.setOnClickListener(mCallbacks);

        mExpandActivityOverflowButton.setAccessibilityDelegate(new AccessibilityDelegate() {

            @Override

            public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo info) {

                super.onInitializeAccessibilityNodeInfo(host, info);

                info.setOpensPopup(true);

            }

        });

        mExpandActivityOverflowButtonImage =

            (ImageView) mExpandActivityOverflowButton.findViewById(R.id.image);

        mExpandActivityOverflowButtonImage.setImageDrawable(expandActivityOverflowButtonDrawable);

core/java/android/widget/Spinner.java

+4 −0
Original line number Diff line number Diff line
@@ -645,6 +645,10 @@ public class Spinner extends AbsSpinner implements OnClickListener { 
    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        info.setClassName(Spinner.class.getName());



        if (mAdapter != null) {

            info.setOpensPopup(true);

        }

    }



    /**

core/java/android/widget/TextView.java

+4 −0
Original line number Diff line number Diff line
@@ -8173,6 +8173,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                info.addAction(AccessibilityNodeInfo.ACTION_CUT);

            }

        }



        if (!isSingleLine()) {

            info.setMultiLine(true);

        }

    }



    @Override

core/java/com/android/internal/view/menu/ActionMenuPresenter.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.SoundEffectConstants; 
import android.view.View;

import android.view.ViewConfiguration;

import android.view.View.MeasureSpec;

import android.view.accessibility.AccessibilityNodeInfo;

import android.view.ViewGroup;

import android.widget.ImageButton;
@@ -594,6 +595,12 @@ public class ActionMenuPresenter extends BaseMenuPresenter 
            }

            super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        }



        @Override

        public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

            super.onInitializeAccessibilityNodeInfo(info);

            info.setOpensPopup(true);

        }

    }



    private class OverflowPopup extends MenuPopupHelper {

core/java/com/android/internal/view/menu/ListMenuItemView.java

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.util.AttributeSet; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityNodeInfo;

import android.widget.CheckBox;

import android.widget.CompoundButton;

import android.widget.ImageView;
@@ -269,4 +270,13 @@ public class ListMenuItemView extends LinearLayout implements MenuView.ItemView 
        }

        return mInflater;

    }



    @Override

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);



        if (mItemData != null && mItemData.hasSubMenu()) {

            info.setOpensPopup(true);

        }

    }

}