diff options
| author | Davor Bertovic <davor@losinj.com> | 2012-02-11 16:53:53 +0100 |
|---|---|---|
| committer | Davor Bertovic <davor@losinj.com> | 2012-02-11 16:53:53 +0100 |
| commit | 598e4159228497a9f8fdde01e96477af86ffdd78 (patch) | |
| tree | b170045225003267be78c98e284434db70970595 /policy | |
| parent | f8a78d0a2a16ac6fc3c4ce20a9c3df10d8725156 (diff) | |
| download | frameworks_base-598e4159228497a9f8fdde01e96477af86ffdd78.zip frameworks_base-598e4159228497a9f8fdde01e96477af86ffdd78.tar.gz frameworks_base-598e4159228497a9f8fdde01e96477af86ffdd78.tar.bz2 | |
Menu unlock (frameworks part)
The option in Settings/Security/Lockscreen was
added before in some CM commit, but not working
and was missing a proper frameworks part
Patchet 3: Done like master Danesh M wanted
Change-Id: I589c77cd58d7beb4093e334f074c7f7643d90858
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/LockScreen.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockScreen.java b/policy/src/com/android/internal/policy/impl/LockScreen.java index 24a2420..c87afe4 100644 --- a/policy/src/com/android/internal/policy/impl/LockScreen.java +++ b/policy/src/com/android/internal/policy/impl/LockScreen.java @@ -298,7 +298,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen { final boolean configDisabled = res.getBoolean(R.bool.config_disableMenuKeyInLockScreen); final boolean isTestHarness = ActivityManager.isRunningInTestHarness(); final boolean fileOverride = (new File(ENABLE_MENU_KEY_FILE)).exists(); - return !configDisabled || isTestHarness || fileOverride; + final boolean menuOverride = Settings.System.getInt(getContext().getContentResolver(), Settings.System.MENU_UNLOCK_SCREEN, 0) == 1; + return !configDisabled || isTestHarness || fileOverride || menuOverride; } /** |