summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Expand)AuthorAgeFilesLines
* Force status bar showing when Keyguard is showing.Jorim Jaggi2014-04-081-0/+4
* am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions."George Mount2014-04-071-4/+56
|\
| * Add Transitions useful for Activity transitions.George Mount2014-04-071-4/+56
* | am dde10d07: Merge "Implement "Back" for Activity Transitions."George Mount2014-04-071-96/+324
|\ \ | |/
| * Implement "Back" for Activity Transitions.George Mount2014-04-071-96/+324
* | am 43c290f0: Tint more icons, fix dialog styles and headersAlan Viverette2014-04-041-1/+1
|\ \ | |/
| * Tint more icons, fix dialog styles and headersAlan Viverette2014-04-041-1/+1
* | Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-devJorim Jaggi2014-04-021-12/+28
|\ \
| * | Wait for Keyguard to be drawn after boot.Jorim Jaggi2014-04-021-12/+28
* | | am 74ee938d: resolved conflicts for merge of ffb22827 to masterCraig Mautner2014-04-011-3/+3
|\ \ \ | | |/ | |/|
| * | resolved conflicts for merge of ffb22827 to masterCraig Mautner2014-04-011-3/+3
| |\ \
| | * \ am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e...Craig Mautner2014-04-011-5/+4
| | |\ \
| | | * \ am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-devCraig Mautner2014-04-011-5/+4
| | | |\ \
| | | | * \ resolved conflicts for merge of 8c6e6e73 to klp-devCraig Mautner2014-04-011-5/+4
| | | | |\ \
| | | | | * \ am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb:...Craig Mautner2014-04-011-3/+3
| | | | | |\ \
| | | | | | * \ am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DIS...Craig Mautner2014-04-011-3/+3
| | | | | | |\ \
| | | | | | | * \ am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not workingCraig Mautner2014-04-011-3/+3
| | | | | | | |\ \
| | | | | | | | * | Fix FLAG_DISMISS_KEYGUARD not workingCraig Mautner2014-04-011-3/+3
* | | | | | | | | | am 4bb047fa: Fix build after bad merge resolutionMichael Kolb2014-04-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix build after bad merge resolutionMichael Kolb2014-04-011-0/+1
* | | | | | | | | | am 7fbde1e8: resolved conflict for merge of 2c73e08d to masterMichael Kolb2014-04-011-1/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | resolved conflict for merge of 2c73e08d to masterMichael Kolb2014-04-011-1/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-devMichael Kolb2014-04-011-1/+14
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Add outset to decor view measuringMichael Kolb2014-03-311-1/+14
* | | | | | | | | Reuse KeyguardViewMediator for new Keyguard implementation.Jorim Jaggi2014-03-313-69/+73
* | | | | | | | | Address comments for I059d80d8b9b9818a778ab685f4672ea2694def63Jorim Jaggi2014-03-311-1/+2
* | | | | | | | | Merge "Make Keyguard a library and make StatusBar the new Keyguard." into mas...Jorim Jaggi2014-03-313-104/+129
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Make Keyguard a library and make StatusBar the new Keyguard.Jorim Jaggi2014-03-283-104/+129
* | | | | | | | | am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mod...Wink Saville2014-03-301-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"Wink Saville2014-03-301-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | GlobalActions: Fix Airplane Mode on/off issuenagarw2014-03-281-3/+4
| * | | | | | | | am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c:...Craig Mautner2014-03-251-5/+9
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73:...Craig Mautner2014-03-251-5/+9
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec:...Craig Mautner2014-03-251-5/+9
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e:...Craig Mautner2014-03-251-5/+9
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow...Craig Mautner2014-03-251-5/+9
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| |
| | | | | | * | | am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-...Craig Mautner2014-03-251-5/+9
| | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/|
| | | | | | | * | Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogsCraig Mautner2014-03-221-5/+9
| | | | | * | | | am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE...Adrian Roos2014-03-181-11/+12
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-181-11/+12
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-181-11/+12
| * | | | | | | | am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualm...Craig Mautner2014-03-141-12/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmergeCraig Mautner2014-03-141-12/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge commit '3b9de0a4' into manualmergeCraig Mautner2014-03-131-12/+16
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Resolved conflicts for merge of ad63d914 to jb-mr2-devCraig Mautner2014-03-131-25/+34
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the key...Craig Mautner2014-03-131-24/+33
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | am 1f52437d: Show the keyguard if unsecure window on topCraig Mautner2014-03-131-24/+33
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Show the keyguard if unsecure window on topCraig Mautner2014-03-121-24/+33
| | | * | | | | | Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-devCraig Mautner2014-03-071-24/+31
| | | |\ \ \ \ \ \
| | | | * | | | | | Show the keyguard if unsecure window on top. DO NOT MERGE.Craig Mautner2014-03-071-24/+31