Removes unused getBouncerContainer method.
Bug: 274159734 Test: code still builds. Change-Id: Icb761be844f1b14736984dcab8815ea1aff8f0ff
This commit is contained in:
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -154,7 +154,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
when(mCentralSurfaces.getBouncerContainer()).thenReturn(mContainer);
|
||||
when(mContainer.findViewById(anyInt())).thenReturn(mKeyguardMessageArea);
|
||||
when(mKeyguardMessageAreaFactory.create(any(KeyguardMessageArea.class)))
|
||||
.thenReturn(mKeyguardMessageAreaController);
|
||||
|
||||
Reference in New Issue
Block a user