summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Expand)AuthorAgeFilesLines
* Merge "AlertDialog and AppError themes for TV."Craig Stout2014-05-141-3/+10
|\
| * AlertDialog and AppError themes for TV.Craig Stout2014-05-131-3/+10
* | am 8452776b: am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for ...Aaron Whyte2014-05-131-0/+6
|\ \
| * \ am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Ma...Aaron Whyte2014-05-131-0/+6
| |\ \
| | * | Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.Aaron Whyte2014-05-121-0/+6
* | | | am d67fd642: am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGR...Aaron Whyte2014-05-131-5/+0
|\ \ \ \ | |/ / /
| * | | am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clock...Aaron Whyte2014-05-131-5/+0
| |\ \ \ | | |/ /
| | * | Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherA...Aaron Whyte2014-05-131-5/+0
* | | | am 064789ef: am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for ...Aaron Whyte2014-05-131-0/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Ma...Aaron Whyte2014-05-131-0/+5
| |\ \ | | |/
| | * Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.Aaron Whyte2014-05-121-0/+5
* | | am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modu...Adam Powell2014-05-061-9/+1
|\ \ \ | |/ /
| * | am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-devAdam Powell2014-05-061-9/+1
| |\ \ | | |/
| | * onWindowDismissed API cleanupAdam Powell2014-05-051-9/+1
* | | am 9abf0b90: am 60158445: Merge "Make global action key timeout configurable....Justin Koh2014-05-021-3/+4
|\ \ \ | |/ /
| * | 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
* | | resolved conflicts for merge of 4f8cd188 to masterJeff Brown2014-05-011-4/+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 8e95d988: am 5c10c3cf: Merge "DialogAlert window changes for Micro" into k...Vinod Krishnan2014-05-011-1/+5
|\ \ \ \ | |/ / /
| * | | 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 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while ...Mark Renouf2014-05-011-2/+2
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | Move key attribute information into KeyEvent.Michael Wright2014-04-281-8/+2
* | | resolved conflicts for merge of d90712d0 to masterJustin Koh2014-04-221-86/+139
|\ \ \ | |/ /
| * | am 3b9a3cc0: Update GlobalActions for watches.Justin Koh2014-04-221-86/+139
| |\ \ | | |/
| | * Update GlobalActions for watches.Justin Koh2014-04-221-86/+139
* | | am 03f7f442: am cb54f978: Merge "Update window alpha at the same time as tran...Mindy Pereira2014-04-171-0/+2
|\ \ \ | |/ /
| * | 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
* | | Split Activity Transitions out of PhoneWindow.George Mount2014-04-171-707/+125
* | | am 26c6a50f: Rename isScreenOn() to isInteractive().Jeff Brown2014-04-111-3/+3
|\ \ \
| * | | Rename isScreenOn() to isInteractive().Jeff Brown2014-04-111-3/+3
* | | | resolved conflicts for merge of 4e5c089e to master-lockscreen-devJeff Brown2014-04-111-27/+18
|\ \ \ \ | |/ / /
| * | | resolved conflicts for merge of 337e764d to masterJeff Brown2014-04-111-27/+18
| |\ \ \ | | |/ /
| | * | 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
* | | | Protect WindowManager's PRIVATE_FLAG_KEYGUARDAdrian Roos2014-04-091-0/+5
* | | | Make FLAG_SHOW_ON_LOCKSCREEN work again.Jorim Jaggi2014-04-091-1/+0
* | | | 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
|\ \ \ \ | |/ / /