diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-08-28 10:46:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 10:46:37 +0000 |
| commit | 87078b738be17c63acaaa70b392b27fecc1349c1 (patch) | |
| tree | 8cda9c997d5153f9b52dba286af2e2d8ccbc4b1d /packages | |
| parent | 729b2a6c2f330c10674bb3fc0c4f2eb57e3d0a43 (diff) | |
| parent | 15dac5f35bb3739cb7a97a616e7ca15c123c60f6 (diff) | |
| download | frameworks_base-87078b738be17c63acaaa70b392b27fecc1349c1.zip frameworks_base-87078b738be17c63acaaa70b392b27fecc1349c1.tar.gz frameworks_base-87078b738be17c63acaaa70b392b27fecc1349c1.tar.bz2 | |
Merge "Make it possible to disable camera on lockscreen" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index c84edf7..726a54f 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -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> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index c0b171a..1d87ce3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -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); } |