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

Commit d45e5f61 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Enable new keyguard" into jb-mr1-dev

parents 69626dab 9c7e630e

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ import android.provider.Settings; 


import com.android.internal.R;

import com.android.internal.policy.PolicyManager;

import com.android.internal.policy.impl.keyguard_obsolete.KeyguardViewManager;

import com.android.internal.policy.impl.keyguard_obsolete.KeyguardViewMediator;

import com.android.internal.policy.impl.keyguard.KeyguardViewManager;

import com.android.internal.policy.impl.keyguard.KeyguardViewMediator;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.telephony.ITelephony;

import com.android.internal.widget.PointerLocationView;
@@ -863,7 +863,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mHeadless = "1".equals(SystemProperties.get("ro.config.headless", "0"));

        if (!mHeadless) {

            // don't create KeyguardViewMediator if headless

            mKeyguardMediator = new KeyguardViewMediator(context, this);

            mKeyguardMediator = new KeyguardViewMediator(context, null);

        }

        mHandler = new PolicyHandler();

        mOrientationListener = new MyOrientationListener(mContext);