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

Commit 8533b95b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Switch to KeyguardHostView to reenable clock and multi user switch."... 

Merge "Switch to KeyguardHostView to reenable clock and multi user switch." into master-lockscreen-dev
parents 40e0b96b 13b67a9c

packages/Keyguard/res/layout/keyguard_bouncer.xml

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

        android:layout_height="match_parent"/>



    <include layout="@layout/keyguard_simple_host_view"

    <include layout="@layout/keyguard_host_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

</FrameLayout>

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.view.ViewTreeObserver; 


import com.android.internal.policy.IKeyguardShowCallback;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardHostView;

import com.android.keyguard.KeyguardSimpleHostView;

import com.android.keyguard.R;

import com.android.keyguard.ViewMediatorCallback;
@@ -49,7 +50,7 @@ public class StatusBarKeyguardViewManager { 
    private ViewMediatorCallback mViewMediatorCallback;

    private PhoneStatusBar mPhoneStatusBar;



    private KeyguardSimpleHostView mKeyguardView;

    private KeyguardHostView mKeyguardView;

    private ViewGroup mRoot;

    private ViewGroup mContainer;

    private StatusBarWindowManager mStatusBarWindowManager;
@@ -102,7 +103,7 @@ public class StatusBarKeyguardViewManager { 
    private void inflateView() {

        removeView();

        mRoot = (ViewGroup) LayoutInflater.from(mContext).inflate(R.layout.keyguard_bouncer, null);

        mKeyguardView = (KeyguardSimpleHostView) mRoot.findViewById(R.id.keyguard_host_view);

        mKeyguardView = (KeyguardHostView) mRoot.findViewById(R.id.keyguard_host_view);

        mKeyguardView.setLockPatternUtils(mLockPatternUtils);

        mKeyguardView.setViewMediatorCallback(mViewMediatorCallback);

        mContainer.addView(mRoot, mContainer.getChildCount());