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

Commit 524735e3 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 18cc6ef2: am 5df9d4c4: Merge "Make it possible to disable camera on lockscreen" into lmp-dev 

* commit '18cc6ef2eadd6ffa15cbdefe59270bda8a94bf4b':
  Make it possible to disable camera on lockscreen
parents 20b41f85 2cad81b2

packages/SystemUI/res/values/config.xml

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

    <!-- Vibration duration for GlowPadView used in SearchPanelView -->

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

    <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. -->

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

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

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

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

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

        ResolveInfo resolved = mContext.getPackageManager().resolveActivityAsUser(getCameraIntent(),

                PackageManager.MATCH_DEFAULT_ONLY,

                PackageManager.MATCH_DEFAULT_ONLY,

                mLockPatternUtils.getCurrentUser());

                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);

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

    }

    }