| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of d90712d0 to master | Justin Koh | 2014-04-22 | 1 | -86/+139 |
| |\ | |||||
| | * | am 3b9a3cc0: Update GlobalActions for watches. | Justin Koh | 2014-04-22 | 1 | -86/+139 |
| | |\ | |||||
| | | * | Update GlobalActions for watches. | Justin Koh | 2014-04-22 | 1 | -86/+139 |
| * | | | am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as tran... | Mindy Pereira | 2014-04-17 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | am cb54f978: Merge "Update window alpha at the same time as translating" into... | Mindy Pereira | 2014-04-17 | 1 | -0/+2 |
| | |\ \ | | |/ | |||||
| | | * | Update window alpha at the same time as translating | Mindy Pereira | 2014-04-17 | 1 | -0/+2 |
| * | | | Split Activity Transitions out of PhoneWindow. | George Mount | 2014-04-17 | 1 | -707/+125 |
| * | | | am 26c6a50f: Rename isScreenOn() to isInteractive(). | Jeff Brown | 2014-04-11 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | Rename isScreenOn() to isInteractive(). | Jeff Brown | 2014-04-11 | 1 | -3/+3 |
| * | | | | resolved conflicts for merge of 4e5c089e to master-lockscreen-dev | Jeff Brown | 2014-04-11 | 1 | -27/+18 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | resolved conflicts for merge of 337e764d to master | Jeff Brown | 2014-04-11 | 1 | -27/+18 |
| | |\ \ \ | | |/ / | |||||
| | | * | | am f24687e2: Merge "Plumb display power state through display manager." into ... | Jeff Brown | 2014-04-11 | 1 | -28/+19 |
| | | |\ \ | | | |/ | |||||
| | | | * | Plumb display power state through display manager. | Jeff Brown | 2014-04-10 | 1 | -28/+19 |
| * | | | | Protect WindowManager's PRIVATE_FLAG_KEYGUARD | Adrian Roos | 2014-04-09 | 1 | -0/+5 |
| * | | | | Make FLAG_SHOW_ON_LOCKSCREEN work again. | Jorim Jaggi | 2014-04-09 | 1 | -1/+0 |
| * | | | | Force status bar showing when Keyguard is showing. | Jorim Jaggi | 2014-04-08 | 1 | -0/+4 |
| * | | | | am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions." | George Mount | 2014-04-07 | 1 | -4/+56 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Add Transitions useful for Activity transitions. | George Mount | 2014-04-07 | 1 | -4/+56 |
| * | | | | am dde10d07: Merge "Implement "Back" for Activity Transitions." | George Mount | 2014-04-07 | 1 | -96/+324 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Implement "Back" for Activity Transitions. | George Mount | 2014-04-07 | 1 | -96/+324 |
| * | | | | am 43c290f0: Tint more icons, fix dialog styles and headers | Alan Viverette | 2014-04-04 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Tint more icons, fix dialog styles and headers | Alan Viverette | 2014-04-04 | 1 | -1/+1 |
| * | | | | Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev | Jorim Jaggi | 2014-04-02 | 1 | -12/+28 |
| |\ \ \ \ | |||||
| | * | | | | Wait for Keyguard to be drawn after boot. | Jorim Jaggi | 2014-04-02 | 1 | -12/+28 |
| * | | | | | am 74ee938d: resolved conflicts for merge of ffb22827 to master | Craig Mautner | 2014-04-01 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | 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 |
| * | | | | | | | | | | am 4bb047fa: Fix build after bad merge resolution | Michael Kolb | 2014-04-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Fix build after bad merge resolution | Michael Kolb | 2014-04-01 | 1 | -0/+1 |
| * | | | | | | | | | | am 7fbde1e8: resolved conflict for merge of 2c73e08d to master | Michael Kolb | 2014-04-01 | 1 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| | * | | | | | | | | 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 |
| * | | | | | | | | | Reuse KeyguardViewMediator for new Keyguard implementation. | Jorim Jaggi | 2014-03-31 | 3 | -69/+73 |
| * | | | | | | | | | Address comments for I059d80d8b9b9818a778ab685f4672ea2694def63 | Jorim Jaggi | 2014-03-31 | 1 | -1/+2 |
| * | | | | | | | | | Merge "Make Keyguard a library and make StatusBar the new Keyguard." into mas... | Jorim Jaggi | 2014-03-31 | 3 | -104/+129 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| | * | | | | | | | | Make Keyguard a library and make StatusBar the new Keyguard. | Jorim Jaggi | 2014-03-28 | 3 | -104/+129 |
| * | | | | | | | | | 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 |
| | | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | |||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |