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

This commit is contained in:
Selim Cinek
2017-09-08 01:56:49 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 9 deletions

View File

@@ -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;
}
}

View File

@@ -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);