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

Commit 0dcfa163 authored by Danesh Mondegarian's avatar Danesh Mondegarian Committed by Gerrit Code Review
Browse files

Lockscreen : Update camera availability check 

Make the default availability of the target dependant on the
availability of a camera rather than the presense of a predefined resource.

Also update .Camera to .CameraLauncher since that is what we default too.

Change-Id: Ib3f06cc76fb7f7df20ec632051d5dbe754a9c69e
parent 30a560dc

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

+3 −6
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen { 
                                    }

                                }

                                TargetDrawable nDrawable = new TargetDrawable(res, getLayeredDrawable(back,front, tmpInset, frontBlank));

                                boolean isCamera = in.getComponent().getClassName().equals("com.android.camera.Camera");

                                boolean isCamera = in.getComponent().getClassName().equals("com.android.camera.CameraLauncher");

                                if (isCamera) {

                                    nDrawable.setEnabled(!mCameraDisabled);

                                } else {
@@ -680,10 +680,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen { 
        boolean disabledByAdmin = mLockPatternUtils.getDevicePolicyManager()

                .getCameraDisabled(null);

        boolean disabledBySimState = mUpdateMonitor.isSimLocked();

        boolean cameraTargetPresent = (mUnlockWidgetMethods instanceof GlowPadViewMethods)

                ? ((GlowPadViewMethods) mUnlockWidgetMethods)

                        .isTargetPresent(com.android.internal.R.drawable.ic_lockscreen_camera)

                        : false;

        boolean cameraPresent = mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);

        boolean searchTargetPresent = (mUnlockWidgetMethods instanceof GlowPadViewMethods)

                ? ((GlowPadViewMethods) mUnlockWidgetMethods)

                        .isTargetPresent(com.android.internal.R.drawable.ic_action_assist_generic)
@@ -695,7 +692,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen { 
            Log.v(TAG, "Camera disabled by Sim State");

        }

        boolean searchActionAvailable = SearchManager.getAssistIntent(mContext) != null;

        mCameraDisabled = disabledByAdmin || disabledBySimState || !cameraTargetPresent;

        mCameraDisabled = disabledByAdmin || disabledBySimState || !cameraPresent;

        mSearchDisabled = disabledBySimState || !searchActionAvailable || !searchTargetPresent;

        mUnlockWidgetMethods.updateResources();

    }