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

Commit 76e7bbc7 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Announce when bouncer becomes visible" into rvc-dev am:... 

Merge "Merge "Announce when bouncer becomes visible" into rvc-dev am: a8a6e271 am: afcde92a" into rvc-d1-dev-plus-aosp
parents af6a1f5d 7a9d8913

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -203,6 +203,7 @@ public class KeyguardBouncer { 
            Log.wtf(TAG, "onFullyShown when view was null");

            Log.wtf(TAG, "onFullyShown when view was null");

        } else {

        } else {

            mKeyguardView.onResume();

            mKeyguardView.onResume();

            mRoot.announceForAccessibility(mKeyguardView.getAccessibilityTitleForCurrentMode());

        }

        }

    }

    }
@@ -438,7 +439,6 @@ public class KeyguardBouncer { 
        mStatusBarHeight = mRoot.getResources().getDimensionPixelOffset(

        mStatusBarHeight = mRoot.getResources().getDimensionPixelOffset(

                com.android.systemui.R.dimen.status_bar_height);

                com.android.systemui.R.dimen.status_bar_height);

        mRoot.setVisibility(View.INVISIBLE);

        mRoot.setVisibility(View.INVISIBLE);

        mRoot.setAccessibilityPaneTitle(mKeyguardView.getAccessibilityTitleForCurrentMode());





        final WindowInsets rootInsets = mRoot.getRootWindowInsets();

        final WindowInsets rootInsets = mRoot.getRootWindowInsets();

        if (rootInsets != null) {

        if (rootInsets != null) {

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

+10 −3
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.eq; 
import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.verifyZeroInteractions;
@@ -56,11 +57,13 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 




import org.junit.Assert;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;





@SmallTest

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidTestingRunner.class)
@@ -91,13 +94,14 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
    private Handler mHandler;

    private Handler mHandler;

    @Mock

    @Mock

    private KeyguardSecurityModel mKeyguardSecurityModel;

    private KeyguardSecurityModel mKeyguardSecurityModel;



    @Rule

    public MockitoRule mRule = MockitoJUnit.rule();

    private ViewGroup mRootView;

    private KeyguardBouncer mBouncer;

    private KeyguardBouncer mBouncer;





    @Before

    @Before

    public void setup() {

    public void setup() {

        allowTestableLooperAsMainThread();

        allowTestableLooperAsMainThread();

        MockitoAnnotations.initMocks(this);

        mDependency.injectTestDependency(KeyguardUpdateMonitor.class, mKeyguardUpdateMonitor);

        mDependency.injectTestDependency(KeyguardUpdateMonitor.class, mKeyguardUpdateMonitor);

        mDependency.injectTestDependency(KeyguardSecurityModel.class, mKeyguardSecurityModel);

        mDependency.injectTestDependency(KeyguardSecurityModel.class, mKeyguardSecurityModel);

        mDependency.injectMockDependency(KeyguardStateController.class);

        mDependency.injectMockDependency(KeyguardStateController.class);
@@ -115,6 +119,8 @@ public class KeyguardBouncerTest extends SysuiTestCase { 
            protected void inflateView() {

            protected void inflateView() {

                super.inflateView();

                super.inflateView();

                mKeyguardView = mKeyguardHostView;

                mKeyguardView = mKeyguardHostView;

                mRoot = spy(mRoot);

                mRootView = mRoot;

            }

            }

        };

        };

    }

    }
@@ -217,6 +223,7 @@ public class KeyguardBouncerTest extends SysuiTestCase { 




        mBouncer.setExpansion(0);

        mBouncer.setExpansion(0);

        verify(mKeyguardHostView).onResume();

        verify(mKeyguardHostView).onResume();

        verify(mRootView).announceForAccessibility(any());

    }

    }





    @Test

    @Test