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

Commit 377473e2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

Remove launched flag notifications_hun_accessibility_refactor. 

Bug: 397507681
Fixes: 436653253
Flag: EXEMPT launched flag removal
Test: atest HeadsUpManagerImplTest
Test: Verify HUN a11y still works
Change-Id: Ife7c1283a2f73623996d309a270fa969524b898b
parent 60b62275

packages/SystemUI/aconfig/systemui.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -153,16 +153,6 @@ flag { 
   }

}



flag {

    name: "notifications_hun_accessibility_refactor"

    namespace: "systemui"

    description: "Refactors where notification HUN accessibility events happen"

    bug: "397507681"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "notification_avalanche_throttle_hun"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotificationEntry.java

+0 −9
Original line number Diff line number Diff line
@@ -672,15 +672,6 @@ public final class NotificationEntry extends ListEntry { 
        }

    }



    public void sendAccessibilityEvent(int eventType) {

        if (com.android.systemui.Flags.notificationsHunAccessibilityRefactor()) {

            return;

        }

        if (row != null) {

            row.sendAccessibilityEvent(eventType);

        }

    }



    /**

     * Used by NotificationMediaManager to determine... things

     * @return {@code true} if we are a media notification

packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java

+0 −12
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.util.ArrayMap; 
import android.util.ArraySet;

import android.util.Log;

import android.util.Pools;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityManager;



import com.android.internal.annotations.VisibleForTesting;
@@ -37,7 +36,6 @@ import com.android.internal.logging.UiEvent; 
import com.android.internal.logging.UiEventLogger;

import com.android.internal.policy.SystemBarUtils;

import com.android.systemui.EventLogTags;

import com.android.systemui.Flags;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.statusbar.StatusBarStateController;
@@ -333,9 +331,6 @@ public class HeadsUpManagerImpl 
            // Add new entry and begin managing it

            mHeadsUpEntryMap.put(entry.getKey(), headsUpEntry);

            onEntryAdded(headsUpEntry, requestedPinnedStatus);

            if (!Flags.notificationsHunAccessibilityRefactor()) {

                entry.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);

            }

            if (!NotificationBundleUi.isEnabled()) {

                entry.setIsHeadsUpEntry(true);

            }
@@ -410,10 +405,6 @@ public class HeadsUpManagerImpl 
            // with the groupmanager

            return;

        }

        if (headsUpEntry.mEntry != null && !Flags.notificationsHunAccessibilityRefactor()) {

            headsUpEntry.mEntry.sendAccessibilityEvent(

                    AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);

        }

        if (requestedPinnedStatus.isPinned()) {

            headsUpEntry.updateEntry(true /* updatePostTime */, "updateNotification");

            PinnedStatus pinnedStatus =
@@ -664,9 +655,6 @@ public class HeadsUpManagerImpl 
            entry.demoteStickyHun();

            mHeadsUpEntryMap.remove(key);

            onEntryRemoved(finalHeadsUpEntry, reason);

            if (!Flags.notificationsHunAccessibilityRefactor()) {

                entry.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);

            }

            if (NotificationThrottleHun.isEnabled()) {

                finalHeadsUpEntry.cancelAutoRemovalCallbacks("removeEntry");

            } else {

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

+3 −4
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        if (intrinsicHeight != getIntrinsicHeight()) {

            notifyHeightChanged(/* needsAnimation= */ false);

        }

        if (Flags.notificationsHunAccessibilityRefactor() && !pinnedStatus.isPinned()) {

        if (!pinnedStatus.isPinned()) {

            setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_NONE);

        }

        if (pinnedStatus.isPinned()) {
@@ -3860,7 +3860,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    protected void onAppearAnimationStarted(boolean isAppear) {

        mLogger.logAppearAnimationStarted(mLoggingKey, /* isAppear = */ isAppear);



        if (Flags.notificationsHunAccessibilityRefactor() && !isAppear) {

        if (!isAppear) {

            // Stop using a live region as soon as a disappear animation starts so that we don't

            // re-announce the notification as it's animating away.

            setAccessibilityLiveRegion(View.ACCESSIBILITY_LIVE_REGION_NONE);
@@ -3881,8 +3881,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
                /* isAppear = */ wasAppearing,

                /* cancelled = */ cancelled

        );

        if (Flags.notificationsHunAccessibilityRefactor()

                && PromotedNotificationUi.isEnabled()

        if (PromotedNotificationUi.isEnabled()

                && !cancelled

                && wasAppearing

                && mPinnedStatus == PinnedStatus.PinnedByUser) {