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

Commit f27bb10e authored by Alexander Roederer's avatar Alexander Roederer Committed by Automerger Merge Worker
Browse files

Merge "Cleanup NOTIFICATION_ANIMATE_BIG_PICTURE flag." into udc-dev am: ee08e56c am: 77e89e62 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22558812



Change-Id: Ie46dc7b15a2950db74f0bb96f0264423ab9fda62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b9b9d08 77e89e62

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −5
Original line number Diff line number Diff line
@@ -108,11 +108,6 @@ object Flags { 
    val NOTIFICATION_SHELF_REFACTOR =

        unreleasedFlag(271161129, "notification_shelf_refactor")



    // TODO(b/263414400): Tracking Bug

    @JvmField

    val NOTIFICATION_ANIMATE_BIG_PICTURE =

        releasedFlag(120, "notification_animate_big_picture")



    @JvmField

    val ANIMATED_NOTIFICATION_SHADE_INSETS =

        releasedFlag(270682168, "animated_notification_shade_insets")

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

+3 −9
Original line number Diff line number Diff line
@@ -419,18 +419,12 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
     */

    public void setAnimationRunning(boolean running) {

        // Sets animations running in the private/public layouts.

        if (mFeatureFlags.isEnabled(Flags.NOTIFICATION_ANIMATE_BIG_PICTURE)) {

        for (NotificationContentView l : mLayouts) {

            if (l != null) {

                l.setContentAnimationRunning(running);

                setIconAnimationRunning(running, l);

            }

        }

        } else {

            for (NotificationContentView l : mLayouts) {

                setIconAnimationRunning(running, l);

            }

        }

        // For groups summaries with children, we want to set the children containers

        // animating as well.

        if (mIsSummaryWithChildren) {

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

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        mNotificationTestHelper.setDefaultInflationFlags(FLAG_CONTENT_VIEW_ALL);



        FakeFeatureFlags fakeFeatureFlags = new FakeFeatureFlags();

        fakeFeatureFlags.set(Flags.NOTIFICATION_ANIMATE_BIG_PICTURE, true);

        fakeFeatureFlags.set(Flags.SENSITIVE_REVEAL_ANIM, false);

        mNotificationTestHelper.setFeatureFlags(fakeFeatureFlags);

    }