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

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

Merge "Make it possible to disable camera on lockscreen" into lmp-dev

parents 729b2a6c 15dac5f3

packages/SystemUI/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ 
    <!-- Vibration duration for GlowPadView used in SearchPanelView -->

    <integer translatable="false" name="config_search_panel_view_vibration_duration">20</integer>



    <!-- Show camera affordance on Keyguard -->

    <bool name="config_keyguardShowCameraAffordance">true</bool>



    <!-- The length of the vibration when the notification pops open. -->

    <integer name="one_finger_pop_duration_ms">10</integer>

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

+2 −1
Original line number Diff line number Diff line
@@ -222,7 +222,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        ResolveInfo resolved = mContext.getPackageManager().resolveActivityAsUser(getCameraIntent(),

                PackageManager.MATCH_DEFAULT_ONLY,

                mLockPatternUtils.getCurrentUser());

        boolean visible = !isCameraDisabledByDpm() && resolved != null;

        boolean visible = !isCameraDisabledByDpm() && resolved != null

                && getResources().getBoolean(R.bool.config_keyguardShowCameraAffordance);

        mCameraImageView.setVisibility(visible ? View.VISIBLE : View.GONE);

    }