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

Commit afa10e74 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes I2598cce2,I64525b73 

* changes:
  Remove icon vertical padding from small dialog height calculation
  Dismiss the BiometricPrompt upon Intent.ACTION_CLOSE_SYSTEM_DIALOGS
parents 23d5317c 9a8209c0

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

+4 −1
Original line number Diff line number Diff line
@@ -298,7 +298,10 @@ public abstract class AuthBiometricView extends LinearLayout { 
                    .getDimension(R.dimen.biometric_dialog_icon_padding);

            mIconView.setY(getHeight() - mIconView.getHeight() - iconPadding);



            final int newHeight = mIconView.getHeight() + 2 * (int) iconPadding;

            // Subtract the vertical padding from the new height since it's only used to create

            // extra space between the other elements, and not part of the actual icon.

            final int newHeight = mIconView.getHeight() + 2 * (int) iconPadding

                    - mIconView.getPaddingTop() - mIconView.getPaddingBottom();

            mPanelController.updateForContentDimensions(mMediumWidth, newHeight,

                    0 /* animateDurationMs */);

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

+30 −0
Original line number Diff line number Diff line
@@ -23,7 +23,10 @@ import android.app.ActivityManager; 
import android.app.ActivityTaskManager;

import android.app.IActivityTaskManager;

import android.app.TaskStackListener;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.hardware.biometrics.Authenticator;
@@ -85,6 +88,28 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        }

    }



    @VisibleForTesting

    final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (mCurrentDialog != null

                    && Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) {

                Log.w(TAG, "ACTION_CLOSE_SYSTEM_DIALOGS received");

                mCurrentDialog.dismissWithoutCallback(true /* animate */);

                mCurrentDialog = null;



                try {

                    if (mReceiver != null) {

                        mReceiver.onDialogDismissed(BiometricPrompt.DISMISSED_REASON_USER_CANCEL);

                        mReceiver = null;

                    }

                } catch (RemoteException e) {

                    Log.e(TAG, "Remote exception", e);

                }

            }

        }

    };



    private final Runnable mTaskStackChangedRunnable = () -> {

        if (mCurrentDialog != null) {

            try {
@@ -204,6 +229,11 @@ public class AuthController extends SystemUI implements CommandQueue.Callbacks, 
        super(context);

        mCommandQueue = commandQueue;

        mInjector = injector;



        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);



        context.registerReceiver(mBroadcastReceiver, filter);

    }



    @Override

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

+14 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.app.ActivityManager; 
import android.app.IActivityTaskManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.hardware.biometrics.Authenticator;
@@ -403,6 +404,19 @@ public class AuthControllerTest extends SysuiTestCase { 
        mAuthController.onDeviceCredentialPressed();

    }



    @Test

    public void testActionCloseSystemDialogs_dismissesDialogIfShowing() throws Exception {

        showDialog(Authenticator.TYPE_BIOMETRIC, BiometricPrompt.TYPE_FACE);

        Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);

        mAuthController.mBroadcastReceiver.onReceive(mContext, intent);

        waitForIdleSync();



        assertNull(mAuthController.mCurrentDialog);

        assertNull(mAuthController.mReceiver);

        verify(mDialog1).dismissWithoutCallback(true /* animate */);

        verify(mReceiver).onDialogDismissed(eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL));

    }



    // Helpers



    private void showDialog(int authenticators, int biometricModality) {