aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "avd edit dialog: Warn if RAM > 512MB for Windows users."Siva Velusamy2012-12-101-0/+15
|\
| * avd edit dialog: Warn if RAM > 512MB for Windows users.Siva Velusamy2012-12-101-0/+15
|/ | | | | | | There is usually a memory allocation failure on Windows with larger amounts of emulated RAM due to the use of a 32 bit emulator. Change-Id: Id0e59739e77c0aaf2776d7d883d6524de7255de2
* Merge "AVD edit dialog: Fix equality comparison."Siva Velusamy2012-12-101-2/+4
|\
| * AVD edit dialog: Fix equality comparison.Siva Velusamy2012-12-101-2/+4
| | | | | | | | | | | | Fixes http://code.google.com/p/android/issues/detail?id=41188 Change-Id: I568b6c9322ce7ecc2d560999719d79ae68722c06
* | Merge "systrace: Support newer atrace options."Siva Velusamy2012-12-107-12/+529
|\ \
| * | systrace: Support newer atrace options.Siva Velusamy2012-12-107-12/+529
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The atrace executable on the device now provides a list of supported categories with the command atrace --list_categories. This CL first tries to determine which version of atrace is present on the device by running the list categories command and attempting to parse its output. For the older version, existing static "Capture Options" dialog is displayed. For the newer version, only the supported categories are displayed. Change-Id: I300e7e652a9ae99f47d61a1669604802b74054a4
* | Merge "Fix test makefile for dvlib."Xavier Ducrohet2012-12-101-1/+1
|\ \
| * | Fix test makefile for dvlib.Xavier Ducrohet2012-12-101-1/+1
| | | | | | | | | | | | Change-Id: Ic10e356e4a878cb633bf72f7b43ad93c0b834022
* | | Merge "41154: Handle allowBackup properly for target < 4"Tor Norbye2012-12-103-3/+17
|\ \ \
| * | | 41154: Handle allowBackup properly for target < 4Tor Norbye2012-12-103-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes 41154: Template Android Application Project for API v3 reports AAPT problem with android:allowBackup="true" Change-Id: I74b4cd0f8df9a74fe9221250cc83b1d15821ce51
* | | | Merge "Unit test fix: make tests more resilient to test jar location"Tor Norbye2012-12-102-11/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Unit test fix: make tests more resilient to test jar locationTor Norbye2012-12-102-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | Also handle case where $ANDROID_BUILD_TOP is set better. Change-Id: Ib39f275417738af9145697e19f4de085255c1655
* | | | Merge "gltrace: Refresh tree view in a separate task."Siva Velusamy2012-12-102-32/+106
|\ \ \ \ | |/ / / |/| | |
| * | | gltrace: Refresh tree view in a separate task.Siva Velusamy2012-12-072-32/+106
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the currently displayed frame is changed, we immediately refresh the tree displaying the list of calls, and the frame summary view displaying the frame buffer as part of the frame change event handler. This CL moves these two operations to a separate task that is scheduled after a short delay (250 ms). This allows us to combine multiple frame change events and respond just once for all of them together. Change-Id: I4edade1e55cbd7394cba03d97b2ee61ca3a258b6
* | | Merge "Move lint unit tests into lint/cli"Tor Norbye2012-12-07540-18/+18
|\ \ \ | |_|/ |/| |
| * | Move lint unit tests into lint/cliTor Norbye2012-12-07540-18/+18
|/ / | | | | | | | | | | | | | | | | | | | | The unit tests for lint have lived in the lint/libs/lint_checks library, but that's not a natural place since the cli library depends on the lint_checks library, yet the lint_check *tests* also depend on cli. Furthermore, the tests also test stuff in the cli library. Thus, move the test sources over to the cli library, which also pulls in the lint_checks library. Change-Id: Ia8527ea894b287915ad12c04c16daf80ace67bdc
* | Merge "Add simple XML dump method"Xavier Ducrohet2012-12-074-3/+198
|\ \
| * | Add simple XML dump methodTor Norbye2012-12-074-3/+198
|/ / | | | | | | Change-Id: I46709d9903e3f2daf4165e17f1e4b581cc217315
* | Merge changes ↵Xavier Ducrohet2012-12-071124-453/+168
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | If78ff744,I5c059cc6,Ie7fba967,Iac1bcbea,Id1409ec4,Ibcee26e6,I348e5270,Iddd154cd,I4c5b3ba0 * changes: Refactor testutils folder structure. Refactor lint folder structure. Fix eclipse projects from previous refactoring. Refactor manifestmerger folder structure. Refactor ddmlib folder structure. Refactor sdklib folder structure. Refactor dvlib folder structure. refactor layoutlib_api folder structure. Refactor common lib folder structure.
| * Refactor testutils folder structure.Xavier Ducrohet2012-12-069-57/+26
| | | | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: If78ff744392c76f94a1a76b33ca70a6f041a391e
| * Refactor lint folder structure.Xavier Ducrohet2012-12-06674-88/+34
| | | | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: I5c059cc6fdf0ac2444b03d435f83f853363cfa32
| * Fix eclipse projects from previous refactoring.Xavier Ducrohet2012-12-063-2/+4
| | | | | | | | Change-Id: Ie7fba967df3008c66310218396ebf228453edd6d
| * Refactor manifestmerger folder structure.Xavier Ducrohet2012-12-0651-48/+18
| | | | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: Iac1bcbeaaf2928681707f809c3718b87f7c5334a
| * Refactor ddmlib folder structure.Xavier Ducrohet2012-12-0673-49/+19
| | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: Id1409ec4eec34d61f3d87f30a7921e54e9965d2c
| * Refactor sdklib folder structure.Xavier Ducrohet2012-12-06208-50/+18
| | | | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: Ibcee26e6c07d7a53a5d96a33a1e290832ee9928d
| * Refactor dvlib folder structure.Xavier Ducrohet2012-12-0620-54/+19
| | | | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: I348e527012ab3268127efbbe4cb682b7bad2306f
| * refactor layoutlib_api folder structure.Xavier Ducrohet2012-12-0657-50/+16
| | | | | | | | | | | | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: Iddd154cd491e21a047d93bd67cc2cfa005fb6158
| * Refactor common lib folder structure.Xavier Ducrohet2012-12-0631-55/+14
|/ | | | | | | | | | Move folders around to match default gradle/maven folder structure. The custom structure confused some IDEs when importing the project as a Gradle project. Change-Id: I4c5b3ba0c145418c3a48fead2edf370864a56dd5
* Merge "monitor: Prefer using bundled SDK rather than lastSdk"Siva Velusamy2012-12-061-13/+17
|\
| * monitor: Prefer using bundled SDK rather than lastSdkSiva Velusamy2012-12-061-13/+17
| | | | | | | | | | | | | | Also fix the path to bundled SDK: monitor is in tools/lib/monitor, not tools/monitor Change-Id: Ia47112b8358076a8d93cc6492bc67490386459e7
* | Merge "Findbugs cleanup"Tor Norbye2012-12-0612-23/+36
|\ \ | |/ |/|
| * Findbugs cleanupTor Norbye2012-12-0612-23/+36
| | | | | | | | | | | | | | Fix a couple of issues found by findbugs, and some test stability fixes. Change-Id: I97390ea606ea25d6a68e5b7f8245e5e689117995
* | Merge "Add sysinfo panel to monitor/ADT"Siva Velusamy2012-12-064-0/+40
|\ \
| * | Add sysinfo panel to monitor/ADTSiva Velusamy2012-12-064-0/+40
| | | | | | | | | | | | Change-Id: If75df27e17f5ad866b4a73a8422444f82c4c7ac0
* | | Merge "Automatically enable graphics profiling if necessary"Siva Velusamy2012-12-061-0/+54
|\ \ \ | |/ / | | / | |/ |/|
| * Automatically enable graphics profiling if necessarySiva Velusamy2012-12-061-0/+54
| | | | | | | | | | | | | | Rather than rely on the user enabling the setting in developer options, we enable it automatically. Change-Id: I25360d88e8b0262dc6c5b9f503cd0e7e2958ba28
* | Merge "Support layout aliases properly"Tor Norbye2012-12-0613-120/+240
|\ \
| * | Support layout aliases properlyTor Norbye2012-12-0613-120/+240
| |/ | | | | | | Change-Id: I3c1dac7809a225118b69f1557a42051e96011198
* | Merge "Fix gradle build of sdk libs by adding testutils."Xavier Ducrohet2012-12-065-2/+29
|\ \ | |/ |/|
| * Fix gradle build of sdk libs by adding testutils.Xavier Ducrohet2012-12-065-2/+29
| | | | | | | | Change-Id: I2cb3a51e2ddf914acb9129a82294b75c568c3949
* | Merge "Filter out non-launcher activity from new project activity list"Tor Norbye2012-12-062-8/+30
|\ \
| * | Filter out non-launcher activity from new project activity listTor Norbye2012-12-052-8/+30
| | | | | | | | | | | | | | | | | | | | | Also show template title rather than template directory name in the template list (issue 38955) Change-Id: Iedd3949aa5c7fce879a4d7fd11e4fa73660d6451
* | | Merge "ddms sysinfo: Add support for gfxinfo"Siva Velusamy2012-12-063-7/+221
|\ \ \ | |/ / |/| |
| * | ddms sysinfo: Add support for gfxinfoSiva Velusamy2012-12-063-7/+221
| | | | | | | | | | | | Change-Id: I8fdb798a0c5374a4be2825cb4be5f4f58437253e
* | | Merge "Fix Ant help output."Xavier Ducrohet2012-12-051-3/+2
|\ \ \ | |_|/ |/| |
| * | Fix Ant help output.Xavier Ducrohet2012-12-051-3/+2
|/ / | | | | | | Change-Id: I415d858ecd1e4c28cd42833c90064d266eeefcf6
* | Merge "Grid Layout tweaks"Tor Norbye2012-12-055-33/+204
|\ \
| * | Grid Layout tweaksTor Norbye2012-12-045-33/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the grid layout rule editor over to the more traditional grid-oriented editing, and makes some tweaks to that handling (along with some bug fixes for namespace handling). This is a better editing experience than the richer but currently broken free form editing of GridLayouts. Change-Id: I4db2c604ddf34e37c6fe4dd2b8270d20c68dc12f
* | | Merge "Add namespace elements from code completion lazily"Tor Norbye2012-12-056-25/+126
|\ \ \
| * | | Add namespace elements from code completion lazilyTor Norbye2012-12-046-25/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XmlUtils.lookupNamespace() method would unconditionally insert a namespace declaration if called with a namespace that is not already declared in the document. This had the negative effect that simply bringing up the code completion dialog on a custom view would immediately insert the app namespace declaration, even if the user didn't select one of the app namespace attributes. Furthermore, this edit would sometimes result in the caret being placed in the wrong place after insertion. This changeset adds a new parameter to the lookupNamespace() method, "create", which lets the caller deliberately decide whether the new namespace element should be created. Second, code completion now only inserts the namespace declaration as part of the completion apply handler, meaning you only get the namespace if you pick one of the custom attributes. It also uses a document position to ensure that the insert and caret positions are preserved properly and take the namespace insertion into account. Change-Id: I21cf678df454b09460139fe35d33ca88b8e91757