summaryrefslogtreecommitdiffstats
path: root/policy/src
Commit message (Expand)AuthorAgeFilesLines
* am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-devAdam Powell2014-05-061-9/+1
|\
| * onWindowDismissed API cleanupAdam Powell2014-05-051-9/+1
* | am 60158445: Merge "Make global action key timeout configurable." into klp-mo...Justin Koh2014-05-021-3/+4
|\ \ | |/
| * Make global action key timeout configurable.Justin Koh2014-05-021-3/+4
* | am 7f6ab17d: Merge "Clean up some terminology related to interactive state." ...Jeff Brown2014-05-011-4/+4
|\ \ | |/
| * Merge "Clean up some terminology related to interactive state." into klp-modu...Jeff Brown2014-05-011-4/+4
| |\
| | * Clean up some terminology related to interactive state.Jeff Brown2014-05-011-4/+4
* | | am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-devVinod Krishnan2014-05-011-1/+5
|\ \ \ | |/ /
| * | Merge "DialogAlert window changes for Micro" into klp-modular-devVinod Krishnan2014-05-011-1/+5
| |\ \ | | |/ | |/|
| | * DialogAlert window changes for MicroVinod Krishnan2014-04-281-1/+5
* | | am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into...Mark Renouf2014-05-011-2/+2
|\ \ \ | |/ /
| * | SwipeDismiss: limit fade to 50% alpha while swipingMark Renouf2014-05-011-2/+2
| |/
* | am 3b9a3cc0: Update GlobalActions for watches.Justin Koh2014-04-221-86/+139
|\ \ | |/
| * Update GlobalActions for watches.Justin Koh2014-04-221-86/+139
* | am cb54f978: Merge "Update window alpha at the same time as translating" into...Mindy Pereira2014-04-171-0/+2
|\ \ | |/
| * Update window alpha at the same time as translatingMindy Pereira2014-04-171-0/+2
* | am f24687e2: Merge "Plumb display power state through display manager." into ...Jeff Brown2014-04-111-28/+19
|\ \ | |/
| * Plumb display power state through display manager.Jeff Brown2014-04-101-28/+19
* | 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 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
* | | | | | | 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
* | | | | | | | | am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen i...Jeff Brown2014-03-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Hang off call by power button while screen is onshower2014-01-031-1/+1