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

Commit c6ad632a authored by Liran Binyamin's avatar Liran Binyamin Committed by Android (Google) Code Review
Browse files

Merge "Hide bubbles when the status bar window is hidden" into main

parents ef3ea2ea 17c308a8

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

+3 −2
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
            };



    void onStatusBarWindowStateChanged(@WindowVisibleState int state) {

        updateBubblesVisibility();

        mStatusBarWindowState = state;

        updateBubblesVisibility();

    }



    @Override
@@ -1726,7 +1726,8 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        StatusBarMode mode = mStatusBarModeRepository.getStatusBarMode().getValue();

        mBubblesOptional.ifPresent(bubbles -> bubbles.onStatusBarVisibilityChanged(

                mode != StatusBarMode.LIGHTS_OUT

                        && mode != StatusBarMode.LIGHTS_OUT_TRANSPARENT));

                        && mode != StatusBarMode.LIGHTS_OUT_TRANSPARENT

                        && mStatusBarWindowState != WINDOW_STATE_HIDDEN));

    }



    void checkBarMode(

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.systemui.statusbar.phone; 


import static android.app.NotificationManager.IMPORTANCE_HIGH;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;

import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;

import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;



import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.StatusBarState.SHADE;
@@ -1110,6 +1112,16 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
        // THEN no NPE when fingerprintManager is null

    }



    @Test

    public void bubbleBarVisibility() {

        createCentralSurfaces();

        mCentralSurfaces.onStatusBarWindowStateChanged(WINDOW_STATE_HIDDEN);

        verify(mBubbles).onStatusBarVisibilityChanged(false);



        mCentralSurfaces.onStatusBarWindowStateChanged(WINDOW_STATE_SHOWING);

        verify(mBubbles).onStatusBarVisibilityChanged(true);

    }



    /**

     * Configures the appropriate mocks and then calls {@link CentralSurfacesImpl#updateIsKeyguard}

     * to reconfigure the keyguard to reflect the requested showing/occluded states.