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

Commit 702d30be authored by András Kurucz's avatar András Kurucz
Browse files

Inline the notification_row_accessibility_expanded flag 

Fixes: 410799977
Bug: 380027122
Test: expand/collapse Notifications with TalkBack
Flag: EXEMPT mechanifal refactor
Change-Id: I8a2e4306fb7911a9f2ae1c4371ada6bb041ae1e2
parent e7722f3f

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -220,16 +220,6 @@ flag { 
    bug: "294830092"

}



flag {

  name: "notification_row_accessibility_expanded"

  namespace: "systemui"

  description: "Prepare ExpandableNotificationRow for new A11y expansion APIs."

  bug: "380027122"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "notification_skip_silent_updates"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java

+10 −39
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.service.notification.NotificationListenerService.REASON_CA 
import static android.view.accessibility.AccessibilityEvent.CONTENT_CHANGE_TYPE_EXPANDED;

import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;



import static com.android.systemui.Flags.notificationRowAccessibilityExpanded;

import static com.android.systemui.Flags.notificationRowTransparency;

import static com.android.systemui.Flags.notificationsPinnedHunInShade;

import static com.android.systemui.flags.Flags.ENABLE_NOTIFICATIONS_SIMULATE_SLOW_MEASURE;
@@ -4273,11 +4272,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            if (mExpansionChangedListener != null) {

                mExpansionChangedListener.onExpansionChanged(nowExpanded);

            }

            if (notificationRowAccessibilityExpanded()) {

            notifyAccessibilityContentExpansionChanged();

        }

    }

    }



    private void notifyAccessibilityContentExpansionChanged() {

        if (AccessibilityManager.getInstance(mContext).isEnabled()) {
@@ -4332,7 +4329,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            info.addAction(AccessibilityAction.ACTION_DISMISS);

        }



        if (notificationRowAccessibilityExpanded()) {

        if (isAccessibilityExpandable()) {

            if (isShowingExpanded()) {

                info.addAction(AccessibilityAction.ACTION_COLLAPSE);
@@ -4344,29 +4340,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        } else {

            info.setExpandedState(AccessibilityNodeInfo.EXPANDED_STATE_UNDEFINED);

        }

        } else {

            boolean expandable = shouldShowPublic();

            boolean isExpanded = false;

            if (!expandable) {

                if (mIsSummaryWithChildren) {

                    expandable = true;

                    if (!mIsMinimized || isExpanded()) {

                        isExpanded = isGroupExpanded();

                    }

                } else {

                    expandable = mPrivateLayout.isContentExpandable();

                    isExpanded = isExpanded();

                }

            }



            if (expandable) {

                if (isExpanded) {

                    info.addAction(AccessibilityAction.ACTION_COLLAPSE);

                } else {

                    info.addAction(AccessibilityAction.ACTION_EXPAND);

                }

            }

        }



        NotificationMenuRowPlugin provider = getProvider();

        if (provider != null) {
@@ -4653,10 +4626,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            pw.print(", mShowNoBackground: " + mShowNoBackground);

            pw.print(", clipBounds: " + getClipBounds());

            pw.print(", isPromotedOngoing: " + isPromotedOngoing());

            if (notificationRowAccessibilityExpanded()) {

            pw.print(", isShowingExpanded: " + isShowingExpanded());

            pw.print(", isAccessibilityExpandable: " + isAccessibilityExpandable());

            }

            pw.print(", isExpandable: " + isExpandable());

            pw.print(", mExpandable: " + mExpandable);

            pw.print(", isUserExpanded: " + isUserExpanded());