summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
Commit message (Collapse)AuthorAgeFilesLines
* am b6d02956: Merge "Bigger clock." into lmp-preview-devJorim Jaggi2014-06-164-11/+8
|\ | | | | | | | | * commit 'b6d029569675a486dde2a7117fdc94658e1576fe': Bigger clock.
| * Merge "Bigger clock." into lmp-preview-devJorim Jaggi2014-06-124-11/+8
| |\
| | * Bigger clock.Jorim Jaggi2014-06-144-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes a bug where notifications would be wrongly padded on Keyguard after rotating the screen. Bug: 15244051 Change-Id: I2418692c3d2ffdd5fe642361f2924629bf9a75eb
* | | am bfb2ad5e: Merge "Revert "Introduced fading views for the camera ↵Jorim Jaggi2014-06-161-5/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | interaction on the lockscreen."" into lmp-preview-dev * commit 'bfb2ad5ed5da824f71290b27bb3962b9641b6a65': Revert "Introduced fading views for the camera interaction on the lockscreen."
| * | Merge "Revert "Introduced fading views for the camera interaction on the ↵Jorim Jaggi2014-06-121-5/+0
| |\ \ | | |/ | |/| | | | lockscreen."" into lmp-preview-dev
| | * Revert "Introduced fading views for the camera interaction on the lockscreen."Jorim Jaggi2014-06-141-5/+0
| | | | | | | | | | | | | | | | | | This reverts commit 4f963c1b557010bf453af500b00f36b68988f8e2. Change-Id: I8c7df9d115be1b89b57fb9c9bb2a12b4c1d45520
| * | Import translations. DO NOT MERGEBaligh Uddin2014-06-131-1/+1
| |/ | | | | | | | | Change-Id: Ibdd11bf4b5a0ebb0394400688dd0e38a70660a62 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2014-06-151-1/+1
| | | | | | | | | | Change-Id: I106f4baf039e03ba6cd7b82c80c60b4f49dd4a7b Auto-generated-cl: translation import
* | am 3ee7fb10: Merge "Introduced fading views for the camera interaction on ↵Selim Cinek2014-06-121-0/+5
|\ \ | |/ | | | | | | | | | | the lockscreen." into lmp-preview-dev * commit '3ee7fb1045024b566d852f12ef8f081206ba7bb5': Introduced fading views for the camera interaction on the lockscreen.
| * Introduced fading views for the camera interaction on the lockscreen.Selim Cinek2014-06-121-0/+5
| | | | | | | | | | Bug: 15126905 Change-Id: I82b0050a4216873d9cd191b32d1e5bf6871acbd6
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-0956-60/+60
| | | | | | | | | | Change-Id: I4bb2c0a0efa01ecd7bca6087689c7d445602268a Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE" into lmp-preview-devBaligh Uddin2014-06-071-2/+2
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-06-041-2/+2
| | | | | | | | | | | | | | | Change-Id: I85f4b222bd979439e0dae33483006dfd50668632 Auto-generated-cl: translation import
* | | Update security method after switching userAdrian Roos2014-06-101-0/+7
| | | | | | | | | | | | | | | Bug: 15445037 Change-Id: If296dd3ab6510c335aba7ffdce5cdd923ceada6b
* | | Import translations. DO NOT MERGEBaligh Uddin2014-06-0956-60/+60
| | | | | | | | | | | | | | | Change-Id: Iead37ea4585e5baa15f5754b0861be288acc283c Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-06-071-2/+2
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I5a97c72a192fe06483e372d2ca5830e66902527d Auto-generated-cl: translation import
* | | | am 6dc68cab: Merge "Fix Keyguard crash when in landscape." into lmp-preview-devJorim Jaggi2014-06-041-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '6dc68cab1858bc899fb3209c61dc86a813e7b8ff': Fix Keyguard crash when in landscape.
| * | | Merge "Fix Keyguard crash when in landscape." into lmp-preview-devJorim Jaggi2014-06-041-1/+2
| |\ \ \
| | * | | Fix Keyguard crash when in landscape.Jorim Jaggi2014-06-041-1/+2
| | | |/ | | |/| | | | | | | | | | | | | Bug: 15391673 Change-Id: Icb50af358a8478672265a420dd7d500a87fb3fa0
* | | | am 612734fb: Merge "Display time to charge on lock screen" into lmp-preview-devAdrian Roos2014-06-042-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '612734fbfa24b925d51dcf47260a87290629f220': Display time to charge on lock screen
| * | | Display time to charge on lock screenAdrian Roos2014-06-042-3/+3
| |/ / | | | | | | | | | | | | Bug: 14410848 Change-Id: I7ffad4dcc83ceeaeb29342439de11c91b4d63ce8
* | | am b2302d43: Merge "Ensure trust agents are only provided by platform ↵Adrian Roos2014-06-042-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | packages" into lmp-preview-dev * commit 'b2302d437fd636d9973f466062cfad145cdd042d': Ensure trust agents are only provided by platform packages
| * | Merge "Ensure trust agents are only provided by platform packages" into ↵Adrian Roos2014-06-042-3/+3
| |\ \ | | | | | | | | | | | | lmp-preview-dev
| | * | Ensure trust agents are only provided by platform packagesAdrian Roos2014-06-032-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents the TrustManagerService from binding to any non-platform trust agents and updates the SampleTrustAgent to use the new permission. Bug: 15287044 Change-Id: I38c3deebd5ad359075e68f52d19417bab5ab43db
* | | | am b733f632: Merge "Move owner info to main lockscreen." into lmp-preview-devJorim Jaggi2014-06-045-27/+46
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'b733f6322870f06d75a020f0f9f0bbba634875e7': Move owner info to main lockscreen.
| * | Move owner info to main lockscreen.Jorim Jaggi2014-06-035-27/+46
| |/ | | | | | | | | | | Bug: 14307636 Bug: 15283575 Change-Id: I8cba9c0e78f825920aca1468d965e8da9b402da8
* | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-06-041-2/+2
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-06-021-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia9cb1365911c82b55df543df627b4c95baeb8361 Auto-generated-cl: translation import
* | | Remove now defunct touch analysis facilityAdrian Roos2014-06-025-714/+1
|/ / | | | | | | | | Bug: 15381470 Change-Id: I2ab252e4c0122d79c9a78b3df643bfd46a105cf0
* | am bdb5b5d1: Merge "Implemented the appear animation for the pattern ↵Selim Cinek2014-05-304-48/+193
|\ \ | |/ | | | | | | | | | | security." into lmp-preview-dev * commit 'bdb5b5d1cc1b248003b0e86a2fe2793230fe5bf3': Implemented the appear animation for the pattern security.
| * Implemented the appear animation for the pattern security.Selim Cinek2014-05-304-48/+193
| | | | | | | | | | | | | | Also refactored AppearAnimationUtils slightly to support this. Bug: 15163546 Change-Id: I411fad20c410875dcf7bc465ea545ed90aac187e
* | Import translations. DO NOT MERGEGeoff Mendal2014-05-281-2/+2
|/ | | | | Change-Id: I1efc7a987d59375281f86b1cf2eb2ab314937abf Auto-generated-cl: translation import
* Appear animation for PIN view.Jorim Jaggi2014-05-284-25/+187
| | | | | Bug: 15163546 Change-Id: I05bc2920cc6e3d19ab64b8b43417b328552e9e2a
* Remove charging text and carrier label on bouncer.Jorim Jaggi2014-05-275-48/+14
| | | | | | | But still show it for SIM PIN/PUK. Bug: 15283575 Change-Id: Id343e5b2fb5c695f46cd23d8509109987fa2d290
* Skeleton for Keyguard security method appear animations.Jorim Jaggi2014-05-2712-0/+69
| | | | | Bug: 15163546 Change-Id: Id1c6b4f21b8f182f9d00fb903370de5512eaba1b
* Improve scrim handlingJorim Jaggi2014-05-261-6/+0
| | | | | Bug: 15163546 Change-Id: I0d2c05b035f832f4b4e6a2fc34113fe9d5677525
* Do not destroy the security method when pressing back.Jorim Jaggi2014-05-261-1/+1
| | | | | | | Fixes jank when the user wants to unlock it next time. Bug: 15088101 Change-Id: If7bc3d92d0f17abb5077b4c06248f368acb2879f
* Merge "Visual refinements for lockscreen." into lmp-preview-devJorim Jaggi2014-05-267-9/+13
|\
| * Visual refinements for lockscreen.Jorim Jaggi2014-05-267-9/+13
| | | | | | | | | | | | Bug: 15244051 Bug: 14999913 Change-Id: I48896cfa3d88a25ae9c244968ae8e457b6d4e82d
* | Merge "Remove unnecessary layout request from Keyguard" into lmp-preview-devAdrian Roos2014-05-261-5/+0
|\ \ | |/ |/|
| * Remove unnecessary layout request from KeyguardAdrian Roos2014-05-231-5/+0
| | | | | | | | | | | | | | | | Reverts the fix for 7137389 that does no longer apply after the architectural change of Keyguard and SystemUI. Bug: 15088101 Change-Id: Ic9234a9e69363b65b6e121eab498cb8d74660c91
* | DO NOT MERGE Only send notification activity intents after dismissing KeyguardAdrian Roos2014-05-251-1/+3
|/ | | | | | | | | Defers delivery of contentIntent and activity actions until the lockscreen has been dismissed, so that activities don't launch beneath it. Bug: 14491010 Change-Id: Ic8c61c18a75d4f0da2d82a0a8a038a5d98ebb71f (cherry picked from commit 79f640dd0d02c1cc199937b160d8f7abd3c1eaeb)
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-05-2156-5/+62
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-05-2056-5/+62
| | | | | | | | | | Change-Id: Ide5f95ce0a67fd2782750bc64e20b27583c35f0b Auto-generated-cl: translation import
* | Merge "Add trust indicator to keyguard"Adrian Roos2014-05-212-0/+12
|\ \
| * | Add trust indicator to keyguardAdrian Roos2014-05-212-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Changes the unlock icon to an open lock when the keyguard will not ask for credentials. Bug: 14295559 Change-Id: If34a5ec9e23b2d22813860faee125e6b2d700643
* | | Merge "Fix 14988763: FUL only shows on bouncer now"Brian Colonna2014-05-211-28/+57
|\ \ \ | |/ / |/| |
| * | Fix 14988763: FUL only shows on bouncer nowBrian Colonna2014-05-201-28/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | FUL used to show on the notification shade when returning from something that was occluding keyguard such as navigation or secure camera. This fix makes FUL only display on the bouncer, never on the notification shade. Change-Id: I6b6dc1453a167161330132c1e2703c296050bf0e
* | | Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class.""Andres Morales2014-05-203-42/+1
|\ \ \