aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[MIPS] Allow tests to be built for MIPS"Andrew Hsieh2012-06-052-3/+3
|\
| * [MIPS] Allow tests to be built for MIPSBhanu Chetlapalli2012-06-042-3/+3
| | | | | | | | | | | | Also fix comment Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | Merge "Allow project templates to be bundled separately"Tor Norbye2012-06-0475-215/+369
|\ \
| * | Allow project templates to be bundled separatelyTor Norbye2012-06-0475-215/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset moves the various FreeMarker templates out of the ADT plugin and over into the tools install area. The code to instantiate templates is simplified a bit now that it no longer needs to both handle files on disk and files read out of the .jar. There's a new first page to the various template wizards which is shown if the tools are not up to date (specifically, if the $SDK/tools/templates/ directory does not exist). This page explains that the tools have to be updated, and the Next button is disabled until they are up to date. This CL also contains some other tweaks suggested by Roman to the activity-to-layout name mapping and misc code changes. Change-Id: I3bc65f54a6b79bbeedfb917a9d34ec0d312f3526
* | | Merge "Make ADT 20 require SDK Tools 20."Xavier Ducrohet2012-06-042-2/+2
|\ \ \ | |_|/ |/| |
| * | Make ADT 20 require SDK Tools 20.Xavier Ducrohet2012-06-042-2/+2
| | | | | | | | | | | | | | | | | | | | | Also fix a bug in the error string format in case the tools are too old. Change-Id: I49162b71398be3cd4e86c84d138742d35a4ab2ca
* | | Merge "Synchronize window docking state between windows"Tor Norbye2012-06-042-7/+64
|\ \ \
| * | | Synchronize window docking state between windowsTor Norbye2012-06-042-7/+64
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new layout editor window docking framework, used for the palette and structure views to allow views to be reorganized and minimized, allows the user to customize (persistently) the window configuration in the layout editor. However, even though the state is persisted, this is a single global state, not a per-window state. This changeset makes the editors automatically synchronize to the global state when they are shown. This means that if you have two layout editors open, and you minimize the palette in one of them, then as soon as you switch to the second layout, the palette is minimized in that editor tab as well. Change-Id: I863043f654c9f48ecce25f0f2686966c68669272
* | | Merge "ADT: NPE when capturing emulator output."Raphael Moll2012-06-041-11/+17
|\ \ \
| * | | ADT: NPE when capturing emulator output.Raphael Moll2012-06-021-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen when starting an emulator from the AVD selector (or the AVD Manager window.) Change-Id: I6f5098bddc0fa54d89c164e98c51cd80509bbaf7
* | | | Merge "Fix potential NPE"Tor Norbye2012-06-021-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix potential NPETor Norbye2012-06-011-1/+4
| | |/ | |/| | | | | | | Change-Id: Ied6d4b2e03cf13078f0468c6203ca1c8bac71499
* | | Merge "Revert "Temporarily disable new project templates""Tor Norbye2012-06-011-19/+2
|\ \ \ | |/ / |/| |
| * | Revert "Temporarily disable new project templates"Tor Norbye2012-06-011-19/+2
|/ / | | | | | | This reverts commit 81b0b45c11fe87bb350917d95c8c24dda7bbe3bf.
* | Merge "Ensure we grab all of a process output."Xavier Ducrohet2012-06-017-76/+108
|\ \
| * | Ensure we grab all of a process output.Xavier Ducrohet2012-06-017-76/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When grabing the output of an external process, during build, we need to make sure we get all of it since we rely on this to parse errors to put error markers on files. The current helper methods returned as soon as the process was finished but this didn't mean that its output was completely read. This could cause issue where a process would fail but no error were read, putting no marker on any file. The fix is twofold: - forces the helper to blocks until all the output is read. - put a marker on the project if the exec fails but nothing was output on stderr. Change-Id: I8f0b3556ea9c4597a309627d6a14a2b0386e4e52
* | | Merge "[MIPS] Enable OpenGL emulation for MIPS"Andrew Hsieh2012-06-011-1/+1
|\ \ \
| * | | [MIPS] Enable OpenGL emulation for MIPSBhanu Chetlapalli2012-06-011-1/+1
|/ / / | | | | | | | | | | | | Change-Id: Ib39de7ccf512a81436e68ac1363010af3cb2d28a Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | | Merge "gltrace: Add a special keyword to not launch any activities."Siva Velusamy2012-06-011-2/+7
|\ \ \
| * | | gltrace: Add a special keyword to not launch any activities.Siva Velusamy2012-06-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | This is a hack to allow tracing of processes like surfaceflinger. Change-Id: I4b542ac95487ed2488796944c98d2d317c3ee428
* | | | Merge "Add gltrace plugin to monitor."Siva Velusamy2012-06-011-0/+1
|\ \ \ \
| * | | | Add gltrace plugin to monitor.Siva Velusamy2012-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Id66891ab28a4265cd47d394913ac9aae432396b7
* | | | | Merge "logcat: Fix scroll lock icon"Siva Velusamy2012-06-013-1/+1
|\ \ \ \ \
| * | | | | logcat: Fix scroll lock iconSiva Velusamy2012-06-013-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I3825ba3149c644e834744f347a3973e9c8cd07ce
* | | | | Merge "Fix warnings"Tor Norbye2012-06-0151-139/+356
|\ \ \ \ \
| * | | | | Fix warningsTor Norbye2012-06-0151-139/+356
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, update our various project-specific Eclipse compiler settings configuration files to include the new Eclipse 4 flags. Second, turn off the "Unchecked conversion from non-annotated type to @NonNull" warnings; there are hundreds or thousands of these, and there isn't much we can do about them when they're coming from platform and library APIs. Third, make the lint projects warning-clean again by addressing various warnings Eclipse found (such as some unclosed resources and some null handling issues; yesterday's null annotation fixes only addressed errors, not warnings.) Change-Id: If75f7401a1cbeef1bf58b47ccaa9ad17bede7f91
* | | | | Merge "Fix 32527: Menu XML editor "add" button problem on Eclipse 4.2"Tor Norbye2012-06-011-0/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix 32527: Menu XML editor "add" button problem on Eclipse 4.2Tor Norbye2012-06-011-0/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This adds a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=381418 Change-Id: I6a68602cd65a8656e4a6f62bf3b181045956136c
* | | | Merge "Fix Linux first-time rendering"Tor Norbye2012-05-311-0/+2
|\ \ \ \
| * | | | Fix Linux first-time renderingTor Norbye2012-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Linux, the first time a screen size or theme is rendered, the wrong image is shown (until the scene is re-rendered). The reason for this is that the first time, the palette previews are generated. And this has the side-effect of replacing the current render session for the editor with the most recent render image from the palette preview. The fix is simple: After rendering previews, trigger another render. Change-Id: Ic00fa8b2703c4ce8ad4068412d5eea7b0b9f093c
* | | | | Merge "Allow running on multiple devices with a single launch."Siva Velusamy2012-05-315-76/+283
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow running on multiple devices with a single launch.Siva Velusamy2012-05-315-76/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides the ability to launch an application on all connected devices with a single launch. This applies only to Run configurations (and not to Debug/Junit test). UI changes: The target tab in the launch configuration dialog provides two options right now: Manual and Automatic. This CL adds a third option that allows launching on all connected devices. A drop down allows the user to further narrow down the list to just physical devices or just emulators. Change-Id: I721a4f41e59da24ae722b93e8ef801bc910f5442
* | | | | am f92f7270: (-s ours) am 212ffd9f: DO NOT MERGE Implement the ↵Jesse Hall2012-05-310-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | EGL_KHR_fence_sync extension * commit 'f92f72709089442c68a226ff506464a8fcf792fe': DO NOT MERGE Implement the EGL_KHR_fence_sync extension
| * | | | am 212ffd9f: DO NOT MERGE Implement the EGL_KHR_fence_sync extensionJesse Hall2012-05-310-0/+0
| |\ \ \ \ |/ / / / / | | | | | | | | | | | | | | | * commit '212ffd9f6f9685cfa2d6d4556b6ab545b34237a3': DO NOT MERGE Implement the EGL_KHR_fence_sync extension
| * | | | DO NOT MERGE Implement the EGL_KHR_fence_sync extensionJesse Hall2012-05-313-18/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick from aosp-master into jb-dev. Bug: 6515813 Change-Id: I78f1bd115044aa9dcc534db855eaed24eb92ecee
* | | | | Merge "Fix bug in manifest metadata handler"Tor Norbye2012-05-311-14/+12
|\ \ \ \ \
| * | | | | Fix bug in manifest metadata handlerTor Norbye2012-05-311-14/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ManifestInfo class keeps a cache of the manifest metadata, such as the package name, minSdkVersion, etc. However, the code which cached the minSdkVersion and targetSdkVersion fields was incorrectly placed inside an unrelated if-block, which meant that in some cases (in particular, manifests specifying a default theme) these fields would not get set, and the class would return an incorrect value of 1 for minSdkVersion, regardless of the actual value specified. Change-Id: I32423cad45c9f6f775b7334ee3fd9bd183497abd
* | | | | Merge "SDK Manager: support standalone sys-img xml."Raphael Moll2012-05-3125-48/+1297
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | SDK Manager: support standalone sys-img xml.Raphael Moll2012-05-3125-48/+1297
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends the addons_list XSD to support both addons sites and OEM's system-image sites. Then this defines a new schema "sys-img" XSD for a site that offers only system images. Change-Id: I77ff56c4c70f57ab8ea44cf4ea3094125653737b
* | | | Merge "Temporarily disable new project templates"Tor Norbye2012-05-311-2/+19
|\ \ \ \
| * | | | Temporarily disable new project templatesTor Norbye2012-05-311-2/+19
| | |/ / | |/| | | | | | | | | | Change-Id: I6d9f7bd41e8d9656ef136ba0e2f3c273af049d6d
* | | | Merge "Eclipse 4.x fix: Don't attempt to get display too early"Tor Norbye2012-05-313-14/+29
|\ \ \ \
| * | | | Eclipse 4.x fix: Don't attempt to get display too earlyTor Norbye2012-05-313-14/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | Also fix a couple of potential NPEs. Change-Id: I80d6b625d672ad2e7b96f2fce311aa4347a45a33
* | | | Merge "Fix cut & paste in XML editors for Eclipse 4.x"Tor Norbye2012-05-312-7/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Fix cut & paste in XML editors for Eclipse 4.xTor Norbye2012-05-302-7/+32
| | | | | | | | | | | | | | | | Change-Id: Ie30c362c71eff0d62e177e06687c362802d416b1
* | | | Merge "Implement the EGL_KHR_fence_sync extension"Jesse Hall2012-05-303-18/+61
|\ \ \ \ | |/ / / |/| | |
| * | | Implement the EGL_KHR_fence_sync extensionJesse Hall2012-05-303-18/+61
| | |/ | |/| | | | | | | | | | Bug: 6515813 Change-Id: I738fc2663d81876dc75ad560fd08506b423a21bf
* | | Merge "Tweak icon"Tor Norbye2012-05-301-0/+0
|\ \ \
| * | | Tweak iconTor Norbye2012-05-301-0/+0
| | | | | | | | | | | | | | | | Change-Id: I9023c937b757277962730aa664d8d3a0be85e830
* | | | Merge "Use aapt output to feed proguard's keep list in ADT."Xavier Ducrohet2012-05-303-6/+35
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.1 at 2024-11-01 00:26:21 +0000