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

Commit 1ce46e80 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[CS] Flip USE_REPOS_FOR_BOUNCER_SHOWING to released." into main

parents 64298716 b84c2cf8

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

+1 −2
Original line number Diff line number Diff line
@@ -773,8 +773,7 @@ object Flags { 


    // TODO(b/285174336): Tracking Bug

    @JvmField

    val USE_REPOS_FOR_BOUNCER_SHOWING =

        unreleasedFlag("use_repos_for_bouncer_showing", teamfood = true)

    val USE_REPOS_FOR_BOUNCER_SHOWING = releasedFlag("use_repos_for_bouncer_showing")



    // 3100 - Haptic interactions

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ public class NotificationStackScrollLayoutControllerTest extends SysuiTestCase { 
        allowTestableLooperAsMainThread();

        MockitoAnnotations.initMocks(this);



        mFeatureFlags.set(Flags.USE_REPOS_FOR_BOUNCER_SHOWING, false);

        mFeatureFlags.set(Flags.USE_REPOS_FOR_BOUNCER_SHOWING, true);



        when(mNotificationSwipeHelperBuilder.build()).thenReturn(mNotificationSwipeHelper);

        when(mKeyguardTransitionRepo.getTransitions()).thenReturn(emptyFlow());