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

Commit 7f569944 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Revert "Update BiometricPrompt UI for large displays" 

This reverts commit f30f327d.

Reason for revert: Regression on existing devices

Change-Id: I0ec61e1113c50257ab52f93be1efc5a9ef0b7b4c
parent f30f327d

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

+1 −19
Original line number Diff line number Diff line
@@ -824,29 +824,11 @@ public abstract class AuthBiometricView extends LinearLayout { 
        return new AuthDialog.LayoutParams(width, totalHeight);

    }



    /**

     * Simple heuristic which should return true displays that are larger than a normal phone.

     * For example, tablet displays, or the unfolded display for foldables.

     */

    private boolean isLargeDisplay(int width, int height) {

        return width > 1200 && height > 1200;

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int width = MeasureSpec.getSize(widthMeasureSpec);

        final int height = MeasureSpec.getSize(heightMeasureSpec);



        Log.d(TAG, "Width: " + width + ", height: " + height);



        final int newWidth;

        if (isLargeDisplay(width, height)) {

            // TODO: Unless we can come up with a one-size-fits-all equation, we may want to

            //  consider moving this to an overlay.

            newWidth = 2 * Math.min(width, height) / 3;

        } else {

            newWidth = Math.min(width, height);

        }

        final int newWidth = Math.min(width, height);



        // Use "newWidth" instead, so the landscape dialog width is the same as the portrait

        // width.

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

+18 −0
Original line number Diff line number Diff line
@@ -117,6 +117,24 @@ public class AuthPanelController extends ViewOutlineProvider { 
        mUseFullScreen = fullScreen;

    }



    public ValueAnimator getTranslationAnimator(float relativeTranslationY) {

        final ValueAnimator animator = ValueAnimator.ofFloat(

                mPanelView.getY(), mPanelView.getY() - relativeTranslationY);

        animator.addUpdateListener(animation -> {

            final float translation = (float) animation.getAnimatedValue();

            mPanelView.setTranslationY(translation);

        });

        return animator;

    }



    public ValueAnimator getAlphaAnimator(float alpha) {

        final ValueAnimator animator = ValueAnimator.ofFloat(mPanelView.getAlpha(), alpha);

        animator.addUpdateListener(animation -> {

            mPanelView.setAlpha((float) animation.getAnimatedValue());

        });

        return animator;

    }



    public void updateForContentDimensions(int contentWidth, int contentHeight,

            int animateDurationMs) {

        if (DEBUG) {