summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge "Fix a bug in TaskStackBuilder where task stack PendingIntents would no...Adam Powell2012-04-051-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix a bug in TaskStackBuilder where task stack PendingIntents wouldAdam Powell2012-04-051-0/+8
* | | | | | | | | | | | | | | Merge "Fix 6216452: Add search target to lock screen"Jim Miller2012-04-0512-29/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix 6216452: Add search target to lock screenJim Miller2012-04-0512-29/+80
* | | | | | | | | | | | | | | | Merge "Minor twaek to the focus behavior."Svetoslav Ganov2012-04-051-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Minor twaek to the focus behavior.Svetoslav Ganov2012-04-051-8/+1
* | | | | | | | | | | | | | | | | Merge "Faster and simpler replace in SSB"Gilles Debunne2012-04-051-46/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Faster and simpler replace in SSBGilles Debunne2012-04-041-46/+21
* | | | | | | | | | | | | | | | | Merge "Enhance Cell Location Api."John Wang2012-04-0518-3/+898
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Enhance Cell Location Api.John Wang2012-04-0518-3/+898
* | | | | | | | | | | | | | | | | Merge "Dump KSM stats in the meminfo."Dianne Hackborn2012-04-051-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Dump KSM stats in the meminfo.Dianne Hackborn2012-04-051-0/+23
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fix build breakageAdam Powell2012-04-051-2/+2
* | | | | | | | | | | | | | | | | Merge "Support metered Wi-Fi NetworkPolicy."Jeff Sharkey2012-04-0517-164/+302
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Support metered Wi-Fi NetworkPolicy.Jeff Sharkey2012-04-0517-164/+302
* | | | | | | | | | | | | | | | | | am f030c948: am 2b0267dc: docs: Deprecate the old UI guidelines about Activit...Scott Main2012-04-055-28/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2b0267dc: docs: Deprecate the old UI guidelines about Activity/Task and MenusScott Main2012-04-055-28/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | docs: Deprecate the old UI guidelines about Activity/Task and MenusScott Main2012-04-055-28/+68
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | am 028e6dd6: am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-051-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am ad606697: Removed HTML artifact from index pageAlexander Lucas2012-04-051-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Removed HTML artifact from index pageAlexander Lucas2012-04-051-1/+0
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Refactor input system into its own service."Jeff Brown2012-04-0522-577/+581
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Refactor input system into its own service.Jeff Brown2012-04-0522-576/+580
* | | | | | | | | | | | | | | | | | Merge "Initial commit of InputManager and keyboard layout API."Jeff Brown2012-04-0518-5/+853
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Initial commit of InputManager and keyboard layout API.Jeff Brown2012-04-0518-5/+853
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Fix 5849324: Changed FUL extents for pattern backup"Brian Colonna2012-04-051-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix 5849324: Changed FUL extents for pattern backupBrian Colonna2012-04-051-4/+4
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-04-0549-1026/+1844
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-04-0549-1026/+1844
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "unlock screen: enable DEBUG and track pattern start/cell progress."JP Abgrall2012-04-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | unlock screen: enable DEBUG and track pattern start/cell progress.JP Abgrall2012-04-041-1/+3
* | | | | | | | | | | | | | | | | | Merge "Lockscreen settings per user"Amith Yamasani2012-04-059-117/+629
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Lockscreen settings per userAmith Yamasani2012-04-059-117/+629
* | | | | | | | | | | | | | | | | | Fix failure to animate away exiting AppWindowTokenCraig Mautner2012-04-051-1/+1
| |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "TaskStackBuilder and Activity navigation features for framework"Adam Powell2012-04-0512-14/+683
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | TaskStackBuilder and Activity navigation features for frameworkAdam Powell2012-04-0512-14/+683
* | | | | | | | | | | | | | | | | | Merge "Clean up status bar, system bar, navigation bar management."Dianne Hackborn2012-04-0525-410/+452
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Clean up status bar, system bar, navigation bar management.Dianne Hackborn2012-04-0425-410/+452
| | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Make sure initial activity state is correct."Martijn Coenen2012-04-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Make sure initial activity state is correct.Martijn Coenen2012-04-051-0/+4
* | | | | | | | | | | | | | | | | | am db9b114b: Merge "Adds flag argument to setMasterMute." into ics-aahJustin Koh2012-04-053-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | / / / / / / / / / / / / | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "Adds flag argument to setMasterMute." into ics-aahJustin Koh2012-04-053-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Adds flag argument to setMasterMute.Justin Koh2012-04-043-4/+13
* | | | | | | | | | | | | | | | | | Merge "Patch to support MIFARE with SAK 0x01"Martijn Coenen2012-04-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Patch to support MIFARE with SAK 0x01Sunil Jogi2012-04-021-0/+1
* | | | | | | | | | | | | | | | | | Merge "Insert the 2 seconds before test start to workaround the race conditon...Yu Shan Emily Lau2012-04-041-16/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Insert the 2 seconds before test start toYu Shan Emily Lau2012-04-041-16/+19
* | | | | | | | | | | | | | | | | | | Fix crash in legacy notification construction path.Daniel Sandler2012-04-041-0/+2
* | | | | | | | | | | | | | | | | | | Merge "Make sure we clean up after ourselves"Romain Guy2012-04-041-15/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Make sure we clean up after ourselvesRomain Guy2012-04-041-15/+18