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

Commit f92a2025 authored by András Kurucz's avatar András Kurucz
Browse files

Inline the notification_shade_close_waits_for_child_animations flag 

Fixes: 429441929
Bug: 388298358
Test: Dismiss the last notification in the locked shade -> observe the
animations
Flag: EXEMPT mechanifal refactor

Change-Id: I04281f7cf1b80e39e45849f161bfdcae2f9321c3
parent 3dd873f5

packages/SystemUI/aconfig/systemui.aconfig

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

}



flag {

    name: "notification_shade_close_waits_for_child_animations"

    namespace: "systemui"

    description: "Improve the locked-shade close animation after dismissing a single notification."

    bug: "388298358"

    metadata {

       purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "scene_container"

    namespace: "systemui"

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationPresenter.java

+3 −8
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.view.View; 
import androidx.annotation.NonNull;



import com.android.internal.statusbar.IStatusBarService;

import com.android.systemui.Flags;

import com.android.systemui.InitController;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor;
@@ -207,13 +206,9 @@ class StatusBarNotificationPresenter implements NotificationPresenter, CommandQu 
                && !mQsController.getExpanded()

                && mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED

                && !isCollapsing()) {

            if (Flags.notificationShadeCloseWaitsForChildAnimations()) {

            // wait for child animations before we close the shade to have a smooth transition

            mNsslController.runAfterAnimationFinished(

                    () -> mStatusBarStateController.setState(StatusBarState.KEYGUARD));

            } else {

                mStatusBarStateController.setState(StatusBarState.KEYGUARD);

            }

        }

    }