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

Commit e5b610ec authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Changed the accessibility experience for notifications" into oc-mr1-dev 

am: b41e47f5

Change-Id: I09e3d6d35ebc266bfda75705ce2c0d968c529496
parents 39797ee2 b41e47f5

core/java/com/android/internal/widget/NotificationExpandButton.java

+0 −8
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.widget.RemoteViews; 
 */

@RemoteViews.RemoteView

public class NotificationExpandButton extends ImageView {

    private View mLabeledBy;



    public NotificationExpandButton(Context context) {

        super(context);
@@ -69,12 +68,5 @@ public class NotificationExpandButton extends ImageView { 
    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

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

        if (mLabeledBy != null) {

            info.setLabeledBy(mLabeledBy);

        }

    }



    public void setLabeledBy(View labeledBy) {

        mLabeledBy = labeledBy;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationHeaderViewWrapper.java

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper { 
        mIcon = mView.findViewById(com.android.internal.R.id.icon);

        mHeaderText = mView.findViewById(com.android.internal.R.id.header_text);

        mExpandButton = mView.findViewById(com.android.internal.R.id.expand_button);

        mExpandButton.setLabeledBy(mRow);

        mWorkProfileImage = mView.findViewById(com.android.internal.R.id.profile_badge);

        mColor = resolveColor(mExpandButton);

        mNotificationHeader = mView.findViewById(com.android.internal.R.id.notification_header);