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

Commit 45028616 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Removes unused getBouncerContainer method. 

Bug: 274159734
Test: code still builds.
Change-Id: Icb761be844f1b14736984dcab8815ea1aff8f0ff
parent 1263ecaf

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java

+0 −7
Original line number Diff line number Diff line
@@ -196,13 +196,6 @@ public class NotificationShadeWindowViewController { 
        }

    }



    /**

     * @return Location where to place the KeyguardBouncer

     */

    public ViewGroup getBouncerContainer() {

        return mView.findViewById(R.id.keyguard_bouncer_container);

    }



    /**

     * @return Location where to place the KeyguardMessageArea

     */

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

+0 −2
Original line number Diff line number Diff line
@@ -217,8 +217,6 @@ public interface CentralSurfaces extends Dumpable, ActivityStarter, LifecycleOwn 


    NotificationPanelViewController getNotificationPanelViewController();



    ViewGroup getBouncerContainer();



    /** Get the Keyguard Message Area that displays auth messages. */

    AuthKeyguardMessageArea getKeyguardMessageArea();

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

+0 −5
Original line number Diff line number Diff line
@@ -1721,11 +1721,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        return mNotificationPanelViewController;

    }



    @Override

    public ViewGroup getBouncerContainer() {

        return mNotificationShadeWindowViewController.getBouncerContainer();

    }



    @Override

    public AuthKeyguardMessageArea getKeyguardMessageArea() {

        return mNotificationShadeWindowViewController.getKeyguardMessageArea();

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

+0 −1
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        mCentralSurfaces = centralSurfaces;

        mBiometricUnlockController = biometricUnlockController;



        ViewGroup container = mCentralSurfaces.getBouncerContainer();

        mPrimaryBouncerCallbackInteractor.addBouncerExpansionCallback(mExpansionCallback);

        mNotificationPanelViewController = notificationPanelViewController;

        if (shadeExpansionStateManager != null) {

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt

+1 −10
Original line number Diff line number Diff line
@@ -63,13 +63,12 @@ import org.junit.Test 
import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.Mock

import org.mockito.Mockito

import org.mockito.Mockito.anyFloat

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.verify

import org.mockito.Mockito.`when` as whenever

import org.mockito.MockitoAnnotations

import org.mockito.Mockito.`when` as whenever



@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest
@@ -323,14 +322,6 @@ class NotificationShadeWindowViewControllerTest : SysuiTestCase() { 
        assertThat(shouldIntercept).isTrue()

    }



    @Test

    fun testGetBouncerContainer() =

        testScope.runTest {

            Mockito.clearInvocations(view)

            underTest.bouncerContainer

            verify(view).findViewById<ViewGroup>(R.id.keyguard_bouncer_container)

        }



    @Test

    fun testGetKeyguardMessageArea() =

        testScope.runTest {