summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
Commit message (Expand)AuthorAgeFilesLines
* Fix padding for SIM pin entry.Jorim Jaggi2014-05-023-22/+26
* resolved conflicts for merge of 4f8cd188 to masterJeff Brown2014-05-011-3/+3
|\
| * am 7f6ab17d: Merge "Clean up some terminology related to interactive state." ...Jeff Brown2014-05-012-8/+6
| |\
| | * Clean up some terminology related to interactive state.Jeff Brown2014-05-012-8/+6
| | * Import translations. DO NOT MERGEBaligh Uddin2014-04-2256-283/+2734
* | | Layout notifications on top and introduce artifical marginJorim Jaggi2014-04-303-3/+3
* | | Merge "Add carrier text on lockscreen in top left corner."Jorim Jaggi2014-04-283-2/+16
|\ \ \
| * | | Add carrier text on lockscreen in top left corner.Jorim Jaggi2014-04-253-2/+16
* | | | Merge "Add new DevicePolicyManager disable flags for keyguard."Jim Miller2014-04-261-1/+22
|\ \ \ \
| * | | | Add new DevicePolicyManager disable flags for keyguard.Jim Miller2014-04-251-1/+22
| |/ / /
* | | | 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
| | |\ \
| | | * \ am a413a4ae: Fix the build. DO NOT MERGEJim Miller2014-03-201-1/+1
| | | |\ \
| | | | * | Fix the build. DO NOT MERGEJim Miller2014-03-191-1/+1
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-231-1/+1
* | | | | | Move bouncer to the bottom, but only on phones.Jorim Jaggi2014-04-173-3/+31
* | | | | | Merge "Fix not being able to unlock SIM PIN."Jorim Jaggi2014-04-174-24/+24
|\ \ \ \ \ \
| * | | | | | Fix not being able to unlock SIM PIN.Jorim Jaggi2014-04-174-24/+24
* | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1756-2/+59
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1656-2/+59
* | | | | | | Merge "Show enter PIN/PUK before notifications on Keyguard."Jorim Jaggi2014-04-163-15/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Show enter PIN/PUK before notifications on Keyguard.Jorim Jaggi2014-04-163-15/+13
* | | | | | | Merge "Remove activitystrings.xml from localized resource directories"Baligh Uddin2014-04-1645-1620/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove activitystrings.xml from localized resource directoriesBaligh Uddin2014-04-1645-1620/+0
* | | | | | | | Merge "Revert "Import translations. DO NOT MERGE""Baligh Uddin2014-04-1656-84/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1656-84/+0
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1656-0/+84
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1456-0/+84
| |/ / / / / /
* | | | | | | Merge "Merge remote-tracking branch 'goog/master-lockscreen-dev'"Dan Sandler2014-04-1456-2338/+274
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | am ae3f7cca: Merge "Add app_name to keyguard package."John Spurlock2014-04-111-0/+2
| |\ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | Basic implementation for notifications on lockscreen.Jorim Jaggi2014-04-054-33/+28
| * | | | | | | am b325345e: Merge "Switch framework Holo references to Quantum.Light"Alan Viverette2014-04-022-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "Switch to KeyguardHostView to reenable clock and multi user switch." i...Jorim Jaggi2014-03-311-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Switch to KeyguardHostView to reenable clock and multi user switch.Jorim Jaggi2014-03-311-1/+1
| * | | | | | | | | am a3dafcfb: Add a SampleTrustAgentAdrian Roos2014-03-317-0/+323
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 46842d94: Make Keyguard trust awareAdrian Roos2014-03-315-7/+37
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Reuse KeyguardViewMediator for new Keyguard implementation." into mast...Jorim Jaggi2014-03-3130-2095/+211
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Reuse KeyguardViewMediator for new Keyguard implementation.Jorim Jaggi2014-03-3130-2095/+211
| * | | | | | | | | | | am bd6738b2: Merge "Mark the keyguard package as required for profile"Alexandra Gherghina2014-03-311-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Make Keyguard a library and make StatusBar the new Keyguard.Jorim Jaggi2014-03-2824-183/+29
| * | | | | | | | | | | am 6ee7d250: Revert "Don\'t prompt at boot if we already did that when decryp...Paul Lawrence2014-03-271-7/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge "Revert "Mark the keyguard package as required for profile""Alexandra Gherghina2014-04-121-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Revert "Mark the keyguard package as required for profile"Alexandra Gherghina2014-04-111-2/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Add app_name to keyguard package.John Spurlock2014-04-101-0/+2
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
generated by cgit v1.1 at 2025-01-09 07:24:39 +0000