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

Commit 3510d130 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Bouncer] Make bouncer view a ConstraintLayout" into tm-qpr-dev am:... 

Merge "[Bouncer] Make bouncer view a ConstraintLayout" into tm-qpr-dev am: 06ab363b am: cd59981e

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



Change-Id: If48a65e38c1406f220f7f1193ea0a087292e9246
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec073d1e cd59981e

packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:layout_gravity="center_horizontal|bottom"

    android:gravity="bottom"

    >

packages/SystemUI/src/com/android/keyguard/AdminSecondaryLockScreenController.java

+21 −2
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ 
 */

package com.android.keyguard;



import static androidx.constraintlayout.widget.ConstraintSet.BOTTOM;

import static androidx.constraintlayout.widget.ConstraintSet.END;

import static androidx.constraintlayout.widget.ConstraintSet.PARENT_ID;

import static androidx.constraintlayout.widget.ConstraintSet.START;

import static androidx.constraintlayout.widget.ConstraintSet.TOP;



import android.annotation.Nullable;

import android.app.admin.IKeyguardCallback;

import android.app.admin.IKeyguardClient;
@@ -30,7 +36,10 @@ import android.util.Log; 
import android.view.SurfaceControlViewHost;

import android.view.SurfaceHolder;

import android.view.SurfaceView;

import android.view.ViewGroup;

import android.view.View;



import androidx.constraintlayout.widget.ConstraintLayout;

import androidx.constraintlayout.widget.ConstraintSet;



import com.android.internal.annotations.VisibleForTesting;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
@@ -49,7 +58,7 @@ public class AdminSecondaryLockScreenController { 
    private static final int REMOTE_CONTENT_READY_TIMEOUT_MILLIS = 500;

    private final KeyguardUpdateMonitor mUpdateMonitor;

    private final Context mContext;

    private final ViewGroup mParent;

    private final ConstraintLayout mParent;

    private AdminSecurityView mView;

    private Handler mHandler;

    private IKeyguardClient mClient;
@@ -156,6 +165,7 @@ public class AdminSecondaryLockScreenController { 
        mUpdateMonitor = updateMonitor;

        mKeyguardCallback = callback;

        mView = new AdminSecurityView(mContext, mSurfaceHolderCallback);

        mView.setId(View.generateViewId());

    }



    /**
@@ -167,6 +177,15 @@ public class AdminSecondaryLockScreenController { 
        }

        if (!mView.isAttachedToWindow()) {

            mParent.addView(mView);

            ConstraintSet constraintSet = new ConstraintSet();

            constraintSet.clone(mParent);

            constraintSet.connect(mView.getId(), TOP, PARENT_ID, TOP);

            constraintSet.connect(mView.getId(), START, PARENT_ID, START);

            constraintSet.connect(mView.getId(), END, PARENT_ID, END);

            constraintSet.connect(mView.getId(), BOTTOM, PARENT_ID, BOTTOM);

            constraintSet.constrainHeight(mView.getId(), ConstraintSet.MATCH_CONSTRAINT);

            constraintSet.constrainWidth(mView.getId(), ConstraintSet.MATCH_CONSTRAINT);

            constraintSet.applyTo(mParent);

        }

    }