summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon ...Xavier Ducrohet2012-10-181-3/+68
|\
| * am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible."...Xavier Ducrohet2012-10-181-3/+68
| |\
| | * Layoutlib: Read and close XML files as soon as possible.Xavier Ducrohet2012-10-181-3/+68
* | | am 441f0672: am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-devXavier Ducrohet2012-10-1729-95/+184
|\ \ \ | |/ /
| * | am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-devXavier Ducrohet2012-10-1729-95/+184
| |\ \ | | |/
| | * Update layoutlib for jb mr1.Xavier Ducrohet2012-10-1729-95/+184
* | | am 136bd7c6: am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into j...Xavier Ducrohet2012-10-159-28/+186
|\ \ \ | |/ /
| * | am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-devXavier Ducrohet2012-10-159-28/+186
| |\ \ | | |/
| | * Fix SDK layout rendering in Eclipse.Xavier Ducrohet2012-10-159-28/+186
* | | am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities....Craig Mautner2012-10-071-1/+2
|\ \ \ | |/ /
| * | am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1...Craig Mautner2012-10-071-1/+2
| |\ \ | | |/
| | * Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-devCraig Mautner2012-10-071-1/+2
| | |\
| | | * Adds showWhenLocked attribute to Activities.Craig Mautner2012-10-061-1/+2
* | | | am 513b8ea1: am 3f1246a2: Merge "Coordinate screen on with the window manager...Jeff Brown2012-10-051-2/+2
|\ \ \ \ | |/ / /
| * | | am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr...Jeff Brown2012-10-051-2/+2
| |\ \ \ | | |/ /
| | * | Coordinate screen on with the window manager.Jeff Brown2012-10-051-2/+2
* | | | am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with ...Adam Cohen2012-10-041-1/+2
|\ \ \ \ | |/ / /
| * | | am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher...Adam Cohen2012-10-041-1/+2
| |\ \ \ | | |/ /
| | * | Plumbing to allow keyguard to be shown with user switcher (issue 7175023)Adam Cohen2012-10-041-1/+2
| | |/
* | | am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-...Dianne Hackborn2012-10-031-1/+6
|\ \ \ | |/ /
| * | am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-devDianne Hackborn2012-10-031-1/+6
| |\ \ | | |/
| | * Fix issue #7267494, issue #7212347Dianne Hackborn2012-10-031-1/+6
* | | am cd781ce2: am cb6f950f: Merge "New internal API to eliminate poke locks." i...Jeff Brown2012-10-011-5/+0
|\ \ \ | |/ /
| * | am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-devJeff Brown2012-10-011-5/+0
| |\ \ | | |/
| | * New internal API to eliminate poke locks.Jeff Brown2012-10-011-5/+0
* | | am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-...Jeff Brown2012-10-011-5/+0
|\ \ \ | |/ /
| * | am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-devJeff Brown2012-10-011-5/+0
| |\ \ | | |/
| | * Remove clearUserActivityTimeout().Jeff Brown2012-09-301-5/+0
* | | am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-devJeff Brown2012-10-011-5/+0
|\ \ \ | |/ /
| * | am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-devJeff Brown2012-09-281-5/+0
| |\ \ | | |/
| | * Get rid of preventScreenOn().Jeff Brown2012-09-281-5/+0
| |/ |/|
| * am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-devJeff Brown2012-09-261-0/+5
| |\ | |/ |/|
* | Make DreamManagerService more robust.Jeff Brown2012-09-261-0/+5
* | Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
|/
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-4/+2
|\
| * Allow multiple 'parcelable' declarations in aidl filesAdam Powell2012-08-161-4/+2
* | Allow acquiring ContentProviders across users.Jeff Sharkey2012-09-211-0/+6
* | Update preloaded-classes for JB-MR1Kenny Root2012-09-191-0/+4
* | am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols optio...Xavier Ducrohet2012-09-173-14/+205
|\ \
| * \ am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| |\ \
| | * | Add --output-text-symbols option to aapt.Xavier Ducrohet2012-09-113-14/+205
* | | | am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert op...Xavier Ducrohet2012-09-173-19/+60
|\ \ \ \ | |/ / /
| * | | am d7252571: Merge "Add --error-on-failed-insert option to aapt."Xavier Ducrohet2012-09-173-19/+60
| |\ \ \ | | |/ /
| | * | Add --error-on-failed-insert option to aapt.Xavier Ducrohet2012-09-113-19/+60
* | | | Animations for user switching.Dianne Hackborn2012-09-101-0/+10
* | | | am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header fi...Elliott Hughes2012-09-092-2/+1
|\ \ \ \ | |/ / /
| * | | am bfe1ab82: Merge "Fix aapt to get expat header files from the approved loca...Elliott Hughes2012-09-092-2/+1
| |\ \ \ | | |/ /
| | * | Fix aapt to get expat header files from the approved location.Elliott Hughes2012-09-092-2/+1
* | | | Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" int...Fabrice Di Meglio2012-09-071-2/+2
|\ \ \ \
| * | | | Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resourcesFabrice Di Meglio2012-09-061-2/+2
generated by cgit v1.1 at 2025-01-09 06:02:06 +0000