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

Commit 5769b649 authored by Priyank Singh's avatar Priyank Singh Committed by android-build-merger
Browse files

Merge "Wrapping the inflater into InjectionInflationController." into qt-dev 

am: 04bd9f90

Change-Id: I52a35aafea3fb6632a6c7cd66fe3af6806706ed7
parents d5e77c97 04bd9f90

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

+8 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.systemui.Dependency;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.util.InjectionInflationController;



public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSecurityView {

    private static final boolean DEBUG = KeyguardConstants.DEBUG;
@@ -67,6 +69,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
    private KeyguardSecurityView mCurrentSecurityView;

    private SecurityCallback mSecurityCallback;

    private AlertDialog mAlertDialog;

    private InjectionInflationController mInjectionInflationController;



    private final KeyguardUpdateMonitor mUpdateMonitor;
@@ -101,6 +104,9 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
        mSecurityModel = new KeyguardSecurityModel(context);

        mLockPatternUtils = new LockPatternUtils(context);

        mUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);



        mInjectionInflationController =  new InjectionInflationController(

            SystemUIFactory.getInstance().getRootComponent());

    }



    public void setSecurityCallback(SecurityCallback callback) {
@@ -157,7 +163,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
        if (view == null && layoutId != 0) {

            final LayoutInflater inflater = LayoutInflater.from(mContext);

            if (DEBUG) Log.v(TAG, "inflating id = " + layoutId);

            View v = inflater.inflate(layoutId, mSecurityViewFlipper, false);

            View v = mInjectionInflationController.injectable(inflater)

                    .inflate(layoutId, mSecurityViewFlipper, false);

            mSecurityViewFlipper.addView(v);

            updateSecurityView(v);

            view = (KeyguardSecurityView)v;