From 371f3408d6d9c3c3781d6e35e591f61026b42240 Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Fri, 30 Nov 2012 09:20:43 -0500 Subject: [PATCH] Only show camera widget to setup users. And remove misspelled and unused field in KeyguardHostView. Bug:7645811 Change-Id: I3d6ceae8d25d0af7b504b4c22782611d25462a62 --- .../internal/policy/impl/keyguard/KeyguardHostView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index 1b7626e90b08b..4fb7a6110ed31 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -92,8 +92,6 @@ public class KeyguardHostView extends KeyguardViewBase { private KeyguardSecurityModel mSecurityModel; private KeyguardViewStateManager mViewStateManager; - boolean mPersitentStickyWidgetLoaded = false; - private Rect mTempRect = new Rect(); private int mDisabledFeatures; @@ -1088,7 +1086,7 @@ public class KeyguardHostView extends KeyguardViewBase { // We currently disable cameras in safe mode because we support loading 3rd party // cameras we can't trust. TODO: plumb safe mode into camera creation code and only // inflate system-provided camera? - if (!mSafeModeEnabled && !cameraDisabledByDpm() + if (!mSafeModeEnabled && !cameraDisabledByDpm() && mUserSetupCompleted && mContext.getResources().getBoolean(R.bool.kg_enable_camera_default_widget)) { View cameraWidget = CameraWidgetFrame.create(mContext, mCameraWidgetCallbacks, mActivityLauncher);