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

Commit 5bd03efe authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Exclude WindowInsets.Type.ime() from credential UI" into rvc-dev am: 06174db5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11760220

Change-Id: I17b56e168d999b9f43d1f41179ae0e572b0e3772
parents a4a603fc 06174db5

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.view.KeyEvent; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.animation.Interpolator;

import android.widget.FrameLayout;
@@ -632,6 +633,7 @@ public class AuthContainerView extends LinearLayout 
                windowFlags,

                PixelFormat.TRANSLUCENT);

        lp.privateFlags |= WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS;

        lp.setFitInsetsTypes(lp.getFitInsetsTypes() & ~WindowInsets.Type.ime());

        lp.setTitle("BiometricPrompt");

        lp.token = windowToken;

        return lp;

packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthContainerViewTest.java

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.testing.TestableLooper.RunWithLooper; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.widget.FrameLayout;

import android.widget.ImageView;
@@ -210,6 +211,14 @@ public class AuthContainerViewTest extends SysuiTestCase { 
        assertTrue((layoutParams.flags & WindowManager.LayoutParams.FLAG_SECURE) != 0);

    }



    @Test

    public void testLayoutParams_excludesImeInsets() {

        final IBinder windowToken = mock(IBinder.class);

        final WindowManager.LayoutParams layoutParams =

                AuthContainerView.getLayoutParams(windowToken);

        assertTrue((layoutParams.getFitInsetsTypes() & WindowInsets.Type.ime()) == 0);

    }



    private void initializeContainer(int authenticators) {

        AuthContainerView.Config config = new AuthContainerView.Config();

        config.mContext = mContext;