aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* logcat: Only listen to user generated scroll eventsSiva Velusamy2012-10-011-6/+52
| | | | | | | Scrolling behavior should not be altered when the scroll bar location changes due to the addition of new messages. Change-Id: Id38deb9f17d6d58bea6f25b33fed23c887c5cc5d
* Merge "ddms-plugin: Add preference for method profiler buffer size"Siva Velusamy2012-10-012-4/+18
|\
| * ddms-plugin: Add preference for method profiler buffer sizeSiva Velusamy2012-10-012-4/+18
|/ | | | | | Fixes http://code.google.com/p/android/issues/detail?id=38000 Change-Id: I3465d1df1c85853ea1cb9fb01c92998842b884c5
* Merge "ManifestMerger: ability to inject attributes."Xavier Ducrohet2012-09-289-19/+312
|\
| * ManifestMerger: ability to inject attributes.Raphael Moll2012-09-289-19/+312
|/ | | | Change-Id: Icbebe1dd3c8cf51f7d38b585a78264d01977e943
* Merge "logcat: Support auto scroll lock."Siva Velusamy2012-09-283-4/+52
|\
| * logcat: Support auto scroll lock.Siva Velusamy2012-09-283-4/+52
|/ | | | | | | | | | | | | | Another go at adding support for automatically enabling/disabling scroll lock. Past attempts have been brittle because of differences in how Windows, Linux and Mac handle the scrollbar. The key to getting this work consistently across platforms seems to be in explicitly setting the range of values for the scrollbar. Setting the maximum to be a high enough value relative to the thumb allows accurate detection of even minor movements away from the bottom of the scrollbar. Change-Id: Ic3259cc4e2e8a20f3a87ce4bf234217cea792f88
* Merge "Add cmd line support to create ui automator projects."Xavier Ducrohet2012-09-273-14/+94
|\
| * Add cmd line support to create ui automator projects.Xavier Ducrohet2012-09-273-14/+94
|/ | | | Change-Id: I34ffff7d7828c171444c40e48fc3dcf093391324
* Merge "Revert "Android makefile for ADT Eclipse IDE." This breaks Mac ↵Raphaël Moll2012-09-275-153/+43
|\ | | | | | | builds. We'll put it back once we understand why."
| * Revert "Android makefile for ADT Eclipse IDE."Raphaël Moll2012-09-275-153/+43
| | | | | | | | | | | | | | | | This breaks Mac builds. We'll put it back once we understand why. This reverts commit be6194b8193acb4a7e04fc70bf0ce49e67530f96 Change-Id: I1a54b65887126b45c07b0cceef96b8b9595b6c51
* | Merge "Fix issue with generation of R classes for libraries."Xavier Ducrohet2012-09-275-26/+67
|\ \
| * | Fix issue with generation of R classes for libraries.Xavier Ducrohet2012-09-275-26/+67
|/ / | | | | | | | | | | | | | | | | | | | | When a clean action happen, the order of compilation of the project isn't dictated by the dependencies between the project. It is therefore important to detect changed in R.txt for each library and recompile the project when that happens. Also fixed a potential NPE when building libraries! Change-Id: I6a87e9c3a4984e5aa6401270cf83eaea74044c9f
* | Merge "Improve aapt error message"Tor Norbye2012-09-274-3/+21
|\ \
| * | Improve aapt error messageTor Norbye2012-09-274-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If anything goes wrong with aapt, we emit an error message that we could not execute aapt and to check the install location. However, if the file exists but isn't executable, or if a parsing error happens in the new SymbolLoader/Writer, the error message is misleading. This changeset makes the error message more specific if it looks like the root cause isn't a missing aapt installation. Change-Id: Ifb09a2dd736f6a93c0f167162826e1ad6e3d2a63
* | | Merge "Cache applicable issue lists per scope set"Tor Norbye2012-09-278-19/+198
|\ \ \ | |/ / |/| |
| * | Cache applicable issue lists per scope setTor Norbye2012-09-278-19/+198
|/ / | | | | | | | | | | | | | | | | | | Keep sets of applicable issues for each scope set. This should make incremental lint slightly more efficient. Also add a check that icon file extensions match the actual file format. Change-Id: I4a7f5e19b91aa3613480aa831ec42065528f02d3
* | Merge "Never generate R class for libraries inside libraries."Xavier Ducrohet2012-09-261-1/+2
|\ \
| * | Never generate R class for libraries inside libraries.Xavier Ducrohet2012-09-261-1/+2
| | | | | | | | | | | | | | | | | | Bad ADT, bad! Change-Id: Id1e0ee1c0001faf16b5551674d037f009222015b
* | | Merge "Add detector for fragments missing ids"Xavier Ducrohet2012-09-267-2/+175
|\ \ \
| * | | Add detector for fragments missing idsTor Norbye2012-09-267-2/+175
| | | | | | | | | | | | | | | | | | | | | | | | See issue 35959 for background. Change-Id: I8042b42e4649163cf8e6974d074ac05777685766
* | | | Merge "37861: Lint should warn when using mm or in units"Xavier Ducrohet2012-09-265-21/+83
|\ \ \ \ | |/ / /
| * | | 37861: Lint should warn when using mm or in unitsTor Norbye2012-09-265-21/+83
| | | | | | | | | | | | | | | | Change-Id: I220112559c1a7f30c505551b41004560b6e89891
* | | | Merge "Manifest Merger: children order should not impact merge."Raphael Moll2012-09-2610-270/+777
|\ \ \ \ | |/ / / |/| | |
| * | | Manifest Merger: children order should not impact merge.Raphael Moll2012-09-2410-270/+777
| | | | | | | | | | | | | | | | Change-Id: I5d4e0b5042c5e510ae1865d5d3ac759c89d00641
* | | | Merge "Fix 33912: Can't create a project, delete, then recreate it"Tor Norbye2012-09-261-4/+28
|\ \ \ \
| * | | | Fix 33912: Can't create a project, delete, then recreate itTor Norbye2012-09-251-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix http://code.google.com/p/android/issues/detail?id=33912 Change-Id: Ieaeb9a4db641efa6591bd9777b3c7731d74952fb
* | | | | Merge "37702: InconsistentArrays fails to identify inconsistent arrays"Tor Norbye2012-09-264-30/+75
|\ \ \ \ \
| * | | | | 37702: InconsistentArrays fails to identify inconsistent arraysTor Norbye2012-09-254-30/+75
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I47d3757cac4b9204bdb15a84a8679921adc049a3
* | | | | | Merge "Ensure that themes are always style-prefixed"Tor Norbye2012-09-269-68/+150
|\ \ \ \ \ \
| * | | | | | Ensure that themes are always style-prefixedTor Norbye2012-09-259-68/+150
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus a few other minor tweaks/bug fixes Change-Id: Ic02db9123674ebfbc8977a94d1da4826ec13fb9b
* | | | | | Merge "Android makefile for ADT Eclipse IDE."Raphael Moll2012-09-265-43/+153
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Android makefile for ADT Eclipse IDE.Raphael Moll2012-09-265-43/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ADT IDE is not part of a full "make sdk". Instead it is invoked as part of sdk/eclipse/build_server.sh. Change-Id: I65d86e6a2743e9bac2ee626b636e559613f6d918
* | | | | Merge "Unit test for symbol loader test"Tor Norbye2012-09-264-1/+246
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Unit test for symbol loader testTor Norbye2012-09-264-1/+246
|/ / / / | | | | | | | | | | | | Change-Id: I5b85b01fb62d659ed75ee998da780feaea75c51c
* | | | Merge "systrace: Release NOTICE file."Siva Velusamy2012-09-251-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | systrace: Release NOTICE file.Siva Velusamy2012-09-241-0/+1
| | | | | | | | | | | | | | | | Change-Id: I5ad19b219ca2c6699c3f467266e9a4159a716b86
* | | | Merge "37733: TargetAPI doesn't fails to report unsupported API"Tor Norbye2012-09-254-3/+204
|\ \ \ \ | |_|/ / |/| | |
| * | | 37733: TargetAPI doesn't fails to report unsupported APITor Norbye2012-09-254-3/+204
|/ / / | | | | | | | | | | | | | | | | | | Make incremental lint in source files use the Eclipse context to find super classes. Change-Id: I31af7a146c259875857026bc7721294205482a91
* | | Merge "Don't flag missing classes if project has not been built yet"Xavier Ducrohet2012-09-242-1/+19
|\ \ \
| * | | Don't flag missing classes if project has not been built yetTor Norbye2012-09-242-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The missing class detector in lint will warn if the manifest file contains references to class files and lint does not see those class files in the class output folder (or in any of the library jars). This is useful for catching typos and deleted classes. However, if you run lint on a project that has not yet been built, this can give misleading or confusing errors, since lint decides that a class exists by whether a .class file is actually there, not by whether a source file exists which would result in a class file getting produced with that name. Change-Id: I3105157a37f575e00b550ba90d883f24c02c16a9
* | | | Merge "Make resource chooser include resources from library projects"Xavier Ducrohet2012-09-248-155/+219
|\ \ \ \
| * | | | Make resource chooser include resources from library projectsTor Norbye2012-09-218-155/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The resource chooser was only showing resources from the current project. This changeset fixes this such that it will merge in resources from library projects as well. It also cleans up the ResourceChooser class such that it has a couple of convenience factory methods, and simplified various call sites to use the factory instead. Finally, it similarly fixes the Go To Declaration hyperlink resolver to also look at library projects when resolving source locations. Change-Id: Id20d14e4d9c6d9133b827ef3a3854e47c65b73fb
* | | | | Merge "SDK Tools depends on platform-tools 15 rc5"Raphael Moll2012-09-241-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | SDK Tools depends on platform-tools 15 rc5Raphael Moll2012-09-241-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I251638e57b49a3f12a63d5b985438282afbad738
* | | | Merge "traceview: Fix check for upper case characters."Siva Velusamy2012-09-244-5/+16
|\ \ \ \
| * | | | traceview: Fix check for upper case characters.Siva Velusamy2012-09-244-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes http://code.google.com/p/android/issues/detail?id=37779 Change-Id: I8c1671d24caed3156b98dcb36d345c0eb1f573d7
* | | | | Merge "ADT: Enforce tools 21 rc5 as a minimum."Raphael Moll2012-09-242-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ADT: Enforce tools 21 rc5 as a minimum.Raphael Moll2012-09-242-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaf796934e4c3afa7334fb023607e1d8eff73dc4c
* | | | | Merge "Show ADT toolbar icons only in Java perspective."Siva Velusamy2012-09-241-23/+9
|\ \ \ \ \