summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 5ec97f4e: am 4f017e75: Merge "When in vibrate mode, all notifications will...Ed Heyl2012-11-091-1/+10
|\
| * am 4f017e75: Merge "When in vibrate mode, all notifications will vibrate." in...Ed Heyl2012-11-091-1/+10
| |\
| | * Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-devEd Heyl2012-11-091-1/+10
| | |\
| | | * When in vibrate mode, all notifications will vibrate.David Agnew2012-11-101-1/+10
* | | | am 5691474c: am ad08e6dc: Merge "Emit event log message when switching users....Jeff Sharkey2012-11-092-0/+4
|\ \ \ \ | |/ / /
| * | | am ad08e6dc: Merge "Emit event log message when switching users." into jb-mr1...Jeff Sharkey2012-11-092-0/+4
| |\ \ \ | | |/ /
| | * | Emit event log message when switching users.Jeff Sharkey2012-11-092-0/+4
| | |/
* | | am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into j...Dianne Hackborn2012-11-085-16/+11
|\ \ \ | |/ /
| * | am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-devDianne Hackborn2012-11-085-16/+11
| |\ \ | | |/
| | * Merge "Remove extraneous logs." into jb-mr1-devDianne Hackborn2012-11-085-16/+11
| | |\
| | | * Remove extraneous logs.Dianne Hackborn2012-11-085-16/+11
* | | | am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard ...Jim Miller2012-11-081-0/+9
|\ \ \ \ | |/ / /
| * | | am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the a...Jim Miller2012-11-081-0/+9
| |\ \ \ | | |/ /
| | * | Add mechanism to kick keyguard to show the assistantJim Miller2012-11-081-0/+9
| | |/
* | | am 081c36de: am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications...Amith Yamasani2012-11-081-0/+4
|\ \ \ | |/ /
| * | am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are mea...Amith Yamasani2012-11-081-0/+4
| |\ \ | | |/
| | * Merge "Don't cancel any notifications that are meant for all users, if no pac...Amith Yamasani2012-11-071-0/+4
| | |\
| | | * Don't cancel any notifications that are meant for all users, if no package is...Amith Yamasani2012-11-071-0/+4
* | | | am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary...Victoria Lease2012-11-081-0/+5
|\ \ \ \ | |/ / /
| * | | am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into ...Victoria Lease2012-11-071-0/+5
| |\ \ \ | | |/ /
| | * | Merge "disable geofences for secondary users" into jb-mr1-devVictoria Lease2012-11-071-0/+5
| | |\ \
| | | * | disable geofences for secondary usersVictoria Lease2012-11-061-0/+5
| | * | | am e6299d5a: Merge "Fires geofence if the device is already in the geofence a...Victoria Lease2012-11-062-72/+247
| | |\ \ \ | | | | |/ | | | |/|
* | | | | am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to ...Jim Miller2012-11-081-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManager...Jim Miller2012-11-071-0/+4
| |\ \ \ \
| | * \ \ \ am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into...Jim Miller2012-11-071-0/+4
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Add isSafeModeEnabled() API to WindowManagerServiceJim Miller2012-11-051-0/+4
| | | |/
* | | | Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEADJean-Baptiste Queru2012-11-082-72/+247
|\ \ \ \
| * \ \ \ am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is...Victoria Lease2012-11-082-72/+247
| |\ \ \ \ | | |/ / /
| | * | | am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in t...Victoria Lease2012-11-062-72/+247
| | |\ \ \ | | | |/ /
| | | * | Fires geofence if the device is already in the geofence area.Victoria Lease2012-11-062-72/+247
| | | |/
* | | | Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEADJean-Baptiste Queru2012-11-0810-0/+0
|\ \ \ \ | |/ / /
| * | | am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0710-0/+0
| |\ \ \
| | * | | Correct executable bit for source filesKenny Root2012-11-0710-0/+0
* | | | | merge 19f8aa180a7ccb29b11a322378002e37517abfc9Jean-Baptiste Queru2012-11-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into j...Baligh Uddin2012-11-051-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user switchingDianne Hackborn2012-11-033-13/+29
| | |\ \
| | * \ \ Merge "Polish user selector accessibility." into jb-mr1-lockscreen-devSvetoslav Ganov2012-11-021-0/+1
| | |\ \ \
| | | * | | Polish user selector accessibility.Svetoslav Ganov2012-11-021-0/+1
| | * | | | am 685cc8c7: Merge "Decrement number of updates in LocationRequest" into jb-m...Laurent Tu2012-11-021-4/+16
| | |\ \ \ \
| | * \ \ \ \ am 8ae0420e: Merge "Fix issue #7343200: Fails to show wallpaper in the backgr...Dianne Hackborn2012-11-024-39/+85
| | |\ \ \ \ \
* | | \ \ \ \ \ am 911d47ec: am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user sw...Dianne Hackborn2012-11-033-13/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2ea9bae7: Fix issue #7457380: IME leaves a mark after user switchingDianne Hackborn2012-11-033-13/+29
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Fix issue #7457380: IME leaves a mark after user switchingDianne Hackborn2012-11-023-13/+29
* | | | | | | | am 940e92e1: am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d...Baligh Uddin2012-11-021-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into j...Baligh Uddin2012-11-021-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge commit '81af21e67cd842d16d4b45e8a2d1ec56ff8d764f' into jb-mr1-devBaligh Uddin2012-11-021-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| | | * | | | am 28e8f76c: Merge "Cannot click on partially visible views in touch explorat...Svetoslav Ganov2012-11-021-0/+21
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge "Use clock's widget as the default keyguard widget" into jb-mr1-lockscr...Michael Jurka2012-11-011-2/+2
| | | |\ \ \ \
| | | | * | | | Use clock's widget as the default keyguard widgetMichael Jurka2012-11-011-2/+2