summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 02e85744 to masterElliott Hughes2014-04-241-2/+1
|\
| * am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libc...Elliott Hughes2014-04-241-2/+1
| |\
| | * Use the suggested public API instead of libcore.os.Elliott Hughes2014-04-241-2/+1
| * | am e0683de5: am 37050124: am a413a4ae: Fix the build. DO NOT MERGEJim Miller2014-03-201-1/+1
| |\ \
| | * \ am 37050124: am a413a4ae: Fix the build. DO NOT MERGEJim Miller2014-03-201-1/+1
| | |\ \
| | | * | Fix the build. DO NOT MERGEJim Miller2014-03-191-1/+1
* | | | | Fix not being able to unlock SIM PIN.Jorim Jaggi2014-04-172-2/+2
* | | | | Show enter PIN/PUK before notifications on Keyguard.Jorim Jaggi2014-04-163-15/+13
* | | | | Hide back button on keyguard and make it work for bouncer.Jorim Jaggi2014-04-101-15/+1
* | | | | Always go through bouncer when unlockingJorim Jaggi2014-04-051-2/+4
* | | | | am 46842d94: Make Keyguard trust awareAdrian Roos2014-03-314-7/+36
|\ \ \ \ \
| * | | | | Make Keyguard trust awareAdrian Roos2014-03-315-8/+39
* | | | | | Reuse KeyguardViewMediator for new Keyguard implementation.Jorim Jaggi2014-03-3129-2095/+181
* | | | | | Make Keyguard a library and make StatusBar the new Keyguard.Jorim Jaggi2014-03-283-158/+5
|/ / / / /
* | | | | Revert "Don't prompt at boot if we already did that when decrypting"Paul Lawrence2014-03-261-7/+0
* | | | | Merge "Don't prompt at boot if we already did that when decrypting"Paul Lawrence2014-03-211-0/+7
|\ \ \ \ \
| * | | | | Don't prompt at boot if we already did that when decryptingPaul Lawrence2014-03-131-0/+7
* | | | | | am 1d6c2573: am aebe3b6c: am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attem...Jim Miller2014-03-201-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am abde0aaa: am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM ...Jim Miller2014-03-201-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dial...Jim Miller2014-03-201-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-devJim Miller2014-03-201-0/+1
| | | |\ \ \
| | | | * | | Attempt to fix a bug where SIM progress dialog gets stuck.Jim Miller2014-03-131-0/+1
* | | | | | | am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen...Chris Craik2014-03-201-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating...Chris Craik2014-03-201-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ONJeanette Löfgren2014-02-151-0/+1
| * | | | am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout ...Adrian Roos2014-03-141-11/+12
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-131-11/+12
| | |/
* | | Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are e...Adrian Roos2014-03-101-11/+12
|\ \ \
| * | | Fix bug that allowed avoiding lockout if too many wrong patterns are entered.Adrian Roos2014-03-101-11/+12
* | | | Keyguard Analytics: Remove unused constant.Adrian Roos2014-03-031-2/+0
|/ / /
* | | Add session analytics to Keyguard.Adrian Roos2014-03-036-5/+770
* | | Disable simple keyguard when notifications enabled.Jim Miller2014-02-251-1/+2
* | | Hide managed profiles from user switchers.Kenny Guy2014-02-243-50/+41
* | | Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS.Dan Sandler2014-02-182-6/+6
* | | Fix problem where input wasn't being requestedJim Miller2014-02-065-80/+79
* | | Add KeyguardSimpleHostView and make it the defaultJim Miller2014-02-065-22/+71
* | | Move launch, verification and menu logic to base classJim Miller2014-02-064-282/+375
* | | SystemUI support for notification visibility.Dan Sandler2014-01-301-3/+29
* | | Clean up KeyguardSecurityCallback documentation and add copyright header.Jim Miller2014-01-282-2/+17
* | | Move majority of security-related logic from KeyguardHostViewJim Miller2014-01-279-577/+630
* | | am dafb2420: am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telep...Wink Saville2014-01-261-1/+1
|\ \ \ | |/ /
| * | Telephony: Modify code to check that PUK code length is always 8.Rakesh Pallerla2014-01-081-1/+1
| |/
* | Fixed issue on Keyguard camera icon, where dragging on itSelim Cinek2014-01-162-53/+76
* | Adding INfcUnlockSettings and NfcUnlock interface class.Andres Morales2013-12-093-0/+41
* | Remove unused imports from frameworks/base.John Spurlock2013-11-2012-33/+0
|/
* Don't show external presentation until keyguard actually showsJim Miller2013-11-141-8/+0
* Don't show keyguard until the device has been provisioned.Jim Miller2013-11-141-1/+2
* Merge "Don't set up external displays from binder thread" into klp-devJim Miller2013-11-141-1/+8
|\
| * Don't set up external displays from binder threadJim Miller2013-11-131-1/+8
* | Merge "Report keyguard as initially showing and secure until we know" into kl...Jim Miller2013-11-141-1/+4
|\ \ | |/ |/|