| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of ffb22827 to master | Craig Mautner | 2014-04-01 | 1 | -3/+3 |
| |\ | |||||
| | * | am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e... | Craig Mautner | 2014-04-01 | 1 | -5/+4 |
| | |\ | |||||
| | | * | am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev | Craig Mautner | 2014-04-01 | 1 | -5/+4 |
| | | |\ | |||||
| | | | * | resolved conflicts for merge of 8c6e6e73 to klp-dev | Craig Mautner | 2014-04-01 | 1 | -5/+4 |
| | | | |\ | |||||
| | | | | * | am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb:... | Craig Mautner | 2014-04-01 | 1 | -3/+3 |
| | | | | |\ | |||||
| | | | | | * | am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix FLAG_DIS... | Craig Mautner | 2014-04-01 | 1 | -3/+3 |
| | | | | | |\ | |||||
| | | | | | | * | am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working | Craig Mautner | 2014-04-01 | 1 | -3/+3 |
| | | | | | | |\ | |||||
| | | | | | | | * | Fix FLAG_DISMISS_KEYGUARD not working | Craig Mautner | 2014-04-01 | 1 | -3/+3 |
| * | | | | | | | | Fix build after bad merge resolution | Michael Kolb | 2014-04-01 | 1 | -0/+1 |
| * | | | | | | | | resolved conflict for merge of 2c73e08d to master | Michael Kolb | 2014-04-01 | 1 | -1/+13 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev | Michael Kolb | 2014-04-01 | 1 | -1/+14 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Add outset to decor view measuring | Michael Kolb | 2014-03-31 | 1 | -1/+14 |
| * | | | | | | | | am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mod... | Wink Saville | 2014-03-30 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue" | Wink Saville | 2014-03-30 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | GlobalActions: Fix Airplane Mode on/off issue | nagarw | 2014-03-28 | 1 | -3/+4 |
| | * | | | | | | | | am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c:... | Craig Mautner | 2014-03-25 | 1 | -5/+9 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | | am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73:... | Craig Mautner | 2014-03-25 | 1 | -5/+9 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | | * | | | | | | am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec:... | Craig Mautner | 2014-03-25 | 1 | -5/+9 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | |||||
| | | | | * | | | | | am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e:... | Craig Mautner | 2014-03-25 | 1 | -5/+9 |
| | | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | |||||
| | | | | | * | | | | am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow... | Craig Mautner | 2014-03-25 | 1 | -5/+9 |
| | | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | |||||
| | | | | | | * | | | am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-... | Craig Mautner | 2014-03-25 | 1 | -5/+9 |
| | | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/| | |||||
| | | | | | | | * | | Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs | Craig Mautner | 2014-03-22 | 1 | -5/+9 |
| | | | | | * | | | | am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE... | Adrian Roos | 2014-03-18 | 1 | -11/+12 |
| | | | | | |\ \ \ \ | | | | | | |/ / / | |||||
| | | | | | | * | | | am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug | Adrian Roos | 2014-03-18 | 1 | -11/+12 |
| | | | | | | |\ \ \ | | | | | | | |/ / | |||||
| | | | | | | | * | | DO NOT MERGE - Fix keyguard pattern lockout bug | Adrian Roos | 2014-03-18 | 1 | -11/+12 |
| | * | | | | | | | | am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualm... | Craig Mautner | 2014-03-14 | 1 | -12/+16 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge | Craig Mautner | 2014-03-14 | 1 | -12/+16 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | Merge commit '3b9de0a4' into manualmerge | Craig Mautner | 2014-03-13 | 1 | -12/+16 |
| | | | |\ \ \ \ \ \ | | | | |/ / / / / | |||||
| | | | | * | | | | | Resolved conflicts for merge of ad63d914 to jb-mr2-dev | Craig Mautner | 2014-03-13 | 1 | -25/+34 |
| | | | | |\ \ \ \ \ | | | | | |/ / / / | |||||
| | | | | | * | | | | am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the key... | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | |\ \ \ \ | | | | | | |/ / / | |||||
| | | | | | | * | | | am 1f52437d: Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-13 | 1 | -24/+33 |
| | | | | | | |\ \ \ | | | | | | | |/ / | |||||
| | | | | | | | * | | Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-12 | 1 | -24/+33 |
| | | | * | | | | | | Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev | Craig Mautner | 2014-03-07 | 1 | -24/+31 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | Show the keyguard if unsecure window on top. DO NOT MERGE. | Craig Mautner | 2014-03-07 | 1 | -24/+31 |
| * | | | | | | | | | | Implement APIs for obtaining, caching themed Drawables | Alan Viverette | 2014-03-24 | 1 | -2/+3 |
| * | | | | | | | | | | Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs | Craig Mautner | 2014-03-21 | 1 | -5/+9 |
| * | | | | | | | | | | Added accessibility APIs for introspecting interactive windows. | Svetoslav | 2014-03-20 | 1 | -8/+9 |
| * | | | | | | | | | | Add stream-level suppression to vibrate/audio services. | John Spurlock | 2014-03-19 | 1 | -2/+2 |
| * | | | | | | | | | | Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-14 | 1 | -12/+16 |
| * | | | | | | | | | | am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by p... | Jeff Brown | 2014-03-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen i... | Jeff Brown | 2014-03-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | | Hang off call by power button while screen is on | shower | 2014-01-03 | 1 | -1/+1 |
| * | | | | | | | | | am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCO... | Jeff Brown | 2014-03-08 | 1 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Declare KEYCODE_SLEEP and KEYCODE_WAKEUP. | Jeff Brown | 2014-03-07 | 1 | -1/+15 |
| * | | | | | | | | | am 2b27ef97: am c969450a: am 840c8474: Merge "Add config_supportAutoRotation.... | Jeff Brown | 2014-03-07 | 1 | -8/+18 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "Add config_supportAutoRotation." into klp-modular-dev | Jeff Brown | 2014-03-07 | 1 | -8/+18 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Add config_supportAutoRotation. | Jeff Brown | 2014-03-06 | 1 | -8/+18 |
| * | | | | | | | | | | Merge commit 'c29ab2dd' into manualmerge | Craig Mautner | 2014-03-06 | 1 | -24/+31 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Show the keyguard if unsecure window on top" into klp-modular-dev | Craig Mautner | 2014-03-07 | 1 | -24/+31 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Show the keyguard if unsecure window on top | Craig Mautner | 2014-03-03 | 1 | -24/+31 |
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |