Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4015c3f8: Merge "Only show camera widget to setup users." into jb-mr1.1-dev

Browse Source 
* commit '4015c3f815fa83e67aa72d2c474e7e6f4c2dd5d0':
  Only show camera widget to setup users.
This commit is contained in:
John Spurlock
2012-11-30 13:24:39 -08:00
committed by Android Git Automerger
parent 9e129f37b6 4015c3f815
commit bd0e180893
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -92,8 +92,6 @@ public class KeyguardHostView extends KeyguardViewBase {
private KeyguardSecurityModel mSecurityModel; private KeyguardSecurityModel mSecurityModel;
private KeyguardViewStateManager mViewStateManager; private KeyguardViewStateManager mViewStateManager;
boolean mPersitentStickyWidgetLoaded = false;
private Rect mTempRect = new Rect(); private Rect mTempRect = new Rect();
private int mDisabledFeatures; 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 // 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 // cameras we can't trust. TODO: plumb safe mode into camera creation code and only
// inflate system-provided camera? // inflate system-provided camera?
if (!mSafeModeEnabled && !cameraDisabledByDpm() if (!mSafeModeEnabled && !cameraDisabledByDpm() && mUserSetupCompleted
&& mContext.getResources().getBoolean(R.bool.kg_enable_camera_default_widget)) { && mContext.getResources().getBoolean(R.bool.kg_enable_camera_default_widget)) {
View cameraWidget = View cameraWidget =
CameraWidgetFrame.create(mContext, mCameraWidgetCallbacks, mActivityLauncher); CameraWidgetFrame.create(mContext, mCameraWidgetCallbacks, mActivityLauncher);