aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fixed DeviceConfig to match change made to device schemaMichael Wright2012-06-191-2/+2
|/ | | | Change-Id: I5f7612ec4cdf45b2b93da759ab6ae218af0cd0aa
* Merge "SDK: Upload SDK controller API binary."Raphael Moll2012-06-181-0/+0
|\
| * SDK: Upload SDK controller API binary.Raphael Moll2012-06-181-0/+0
| | | | | | | | Change-Id: Idad13f9caaf88a919ab91318f775e04ea9f1a4b6
* | Merge "Added device functionality to the AVD manager"Michael Wright2012-06-184-31/+217
|\ \
| * | Added device functionality to the AVD managerMichael Wright2012-06-184-31/+217
| | | | | | | | | | | | Change-Id: Ib67a7b8f123302ee75eefcb45e9cac233f026f28
* | | Merge "Added FolderConfig creation and config loading for Devices"Michael Wright2012-06-185-11/+306
|\ \ \ | |/ /
| * | Added FolderConfig creation and config loading for DevicesMichael Wright2012-06-185-11/+306
|/ / | | | | | | Change-Id: Iae7b32df991df946bba22aba5ab9b32ed2c094ea
* | Merge "Tweak wizard title and leave target dropdown menu enabled"Tor Norbye2012-06-183-9/+42
|\ \
| * | Tweak wizard title and leave target dropdown menu enabledTor Norbye2012-06-183-9/+42
| | | | | | | | | | | | | | | | | | Also add wizard descriptions. Change-Id: Id4060f192dc6e4a14d75d3e9c442015cf9990020
* | | Merge "Format unknown API level a bit better in the new project wizard."Xavier Ducrohet2012-06-181-1/+2
|\ \ \
| * | | Format unknown API level a bit better in the new project wizard.Xavier Ducrohet2012-06-181-1/+2
|/ / / | | | | | | | | | Change-Id: Ib4608c92d38f32fd2418d5c2442fc10d1b678a0b
* | | Merge "Prevent a possible NPE when creating a project."Xavier Ducrohet2012-06-181-9/+10
|\ \ \ | |_|/ |/| |
| * | Prevent a possible NPE when creating a project.Xavier Ducrohet2012-06-181-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | This can happen when adding a jar file to a project during creation. The jar file triggers a change to a project that doesn't technically exist yet. Change-Id: I6de1e1be1f057cbc1921f3a2074aa45684c93bbb
* | | Merge "AVD Editor: support Enum Hardware Properties."Raphael Moll2012-06-183-36/+151
|\ \ \ | |_|/ |/| |
| * | AVD Editor: support Enum Hardware Properties.Raphael Moll2012-06-183-36/+151
| | | | | | | | | | | | | | | | | | Used to support the enum touch screen type. Change-Id: Ia3419527a391b35f7e3c8a4853c8603907defe39
* | | Merge "Fix instructions from SDK Controller app"Raphael Moll2012-06-181-2/+4
|\ \ \ | |/ /
| * | Fix instructions from SDK Controller appRaphael Moll2012-06-181-2/+4
| | | | | | | | | | | | | | | | | | SDK Bug: 6675523 Change-Id: I2d2ec065c1fd31ed682f11be7c80f0dac6816a24
* | | Merge "Update SDK release files."Xavier Ducrohet2012-06-182-2/+2
|\ \ \ | |_|/ |/| |
| * | Update SDK release files.Xavier Ducrohet2012-06-182-2/+2
|/ / | | | | | | | | | | (cherry picked from commit 93ebf9bf54c3e052a49f68a221b57577e5f602ef) Change-Id: I3d70a48286674d43a7af6212dabce7053e2e1c7c
* | Merge "Rename template file from _ prefix"Tor Norbye2012-06-187-5/+10
|\ \
| * | Rename template file from _ prefixTor Norbye2012-06-187-5/+10
| |/ | | | | | | | | | | | | | | | | | | One of the template files ended up not getting packaged, probably because it started with a "_". Also, add @Override to some methods overriding a superclass method (onCreate(Bundle)) and fix an NPE. Change-Id: Ic2f15d968cca156704146bdc4ec501d1359a7620
* | Merge "Add lib source folders to the emma report."Xavier Ducrohet2012-06-184-7/+23
|\ \ | |/ |/|
| * Add lib source folders to the emma report.Xavier Ducrohet2012-06-154-7/+23
| | | | | | | | | | | | | | This allows seeing the library source code in the HTML report. Change-Id: I30cd9fa99d2962bb4c12cba6f2ba044857836b93
* | Merge "Workaround for Eclipse resource detection."Tor Norbye2012-06-183-11/+22
|\ \
| * | Workaround for Eclipse resource detection.Tor Norbye2012-06-183-11/+22
|/ / | | | | | | | | | | Plus close a potentially unclosed resource. Change-Id: I4eb69c28dc120ab3eb5fe5724149b749ed9fe335
* | Merge "Preview support in the templates"Tor Norbye2012-06-1816-349/+756
|\ \
| * | Preview support in the templatesTor Norbye2012-06-1816-349/+756
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a Preview page to the end of the template wizards which shows the changes to be applied to the project - first the files which were edited (merged), such as the manifest file in the case of a new activity, and second the text files to be created, and third the binary files to be created. In addition, the user can now uncheck any of these changes, if for example the manifest file edit isn't wanted. Furthermore, the now that the changes are computed up front, the phase of applying the changes is run in the background with a progress bar in the New-wizard. There's also some consolidation of the various template wizards to handle things like the upgrade-page and the dependency-page in one place. Infrastructure wise this changes the template instantiation from being based on File manipulation to using the refactoring infrastructure's change support, which should be more reliable. It also fixes a bug where projects were marked as library projects which should not have be. Change-Id: I496761f01c7ec28bf9170e4d1041211e3ebe285b
* | Merge "Fix convert8To4, convert8To5"Raphaël Moll2012-06-151-2/+2
|\ \
| * | Fix convert8To4, convert8To5Jack Palevich2012-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See b/5680952 "Compilation warnings in etc1.cpp" for discussion. This is a manual merge of an update that was made to frameworks/native/opengl/libs/ETC1/etc1.cpp. sdk/emulator/opengl/host/libs/Translator/GLcommon/etc1.cpp is an exact copy of frameworks/native/opengl/libs/ETC1/etc1.cpp, so we might as well keep the two versions in synch. Bug: 5680952 Change-Id: Icf5d5ed2e7c5c79eb9677d210b1ff5fee507271d
* | | Merge changes Ife59a297,Id8db82e2Xavier Ducrohet2012-06-1519-195/+543
|\ \ \ | |/ / |/| / | |/ | | | | * changes: Fix issue where libraries were not getting instrumented. Fix emma for split projects.
| * Fix issue where libraries were not getting instrumented.Xavier Ducrohet2012-06-159-154/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They actually were instrumented but the emma output file was not passed to the report task. After trying to make each library generate its own .em file and passing to the report task, I gave up due to FileSet (and the report task) being stupid. So the main fix is having the libraries contribute to the main coverage.em file (since it's build using the merge option) which location is passed to the library project. The changes to the custom task was to support querying the libraries for a path with a given leaf (from the lib root folder) but this is not used at the moment. The other tasks are slightly cleaned up due to this though and are getting prepared to support customized folder names in folder. Change-Id: Ife59a2971ce6f2acf01b923abe90dea8adee462a
| * Fix emma for split projects.Xavier Ducrohet2012-06-1417-61/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | The location of the .em file was wrong. Changing its location means it gets put in the tested project so we need a way to know where the output of the project is. As we need to be better at supporting customized projects folder, we introduce a new task that will be able to look for the customized path of any projects. So far we only support the output folder and the source folder. Change-Id: Id8db82e254baae2088827c96b7719f94c92c927c
* | Merge "Launcher activities are not flagged as unprotected anymore if they ↵Tor Norbye2012-06-152-1/+29
|\ \ | | | | | | | | | are not protected by permissions."
| * | Launcher activities are not flagged as unprotected anymore if they are not ↵Sebastian Porst2012-06-152-1/+29
|/ / | | | | | | | | | | protected by permissions. Change-Id: I4811757779ca8048cd84f51173d8325d9f4af3d7
* | Merge "Project wizard tweaks"Tor Norbye2012-06-159-242/+108
|\ \
| * | Project wizard tweaksTor Norbye2012-06-159-242/+108
|/ / | | | | | | | | | | | | | | | | | | | | | | Get rid of the ApplicationSkeleton page, and move the Create Custom Icon checkbox up to the front page. Also add a new "Mark as library project" checkbox there, which allows to create a new library project. Move the icon page up such that it appears before the activity template pages. Fix a bug in minSdk handling. And get rid of the "Android Blank Project" wizard since it's now redundant with the Android Application Project. Change-Id: I54ea0bb740ad8078008a832799378694f37bf9e0
* | Merge "SDK Manager fix display of update revisions."Raphael Moll2012-06-152-3/+3
|\ \
| * | SDK Manager fix display of update revisions.Raphael Moll2012-06-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | A couple of occurences were displaying full revision for updates (e.g "Update available: rev. 20.0.0") instead of the short version (e.g. "rev. 20"). Change-Id: I593ba952df714b50e548dbb447aaf9ac4e4192ca
* | | Merge "SDK Manager fix."Raphael Moll2012-06-157-40/+291
|\ \ \ | |/ /
| * | SDK Manager fix.Raphael Moll2012-06-157-40/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change the XML fetcher to cope with: - input streams that do not support mark/reset when the caller expects one as such. - the XML parser/validator closing the input stream when the caller still needs it open. Change-Id: I5af24b7b8545f9c5f60a13d5dc06ebfc4bb9b0dd
* | | Merge "Misc. Minor bufixes"Siva Velusamy2012-06-152-3/+3
|\ \ \
| * | | Misc. Minor bufixesSiva Velusamy2012-06-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split Tooltip with newlines. On Linux, this showed up as a single long line. - Check for display !disposed before accessing it. Change-Id: I9790cd2f3bc43dbd5d0b5bae4a84b2f0b92076b1
* | | | Merge "Misc bugfixes"Tor Norbye2012-06-1512-49/+97
|\ \ \ \
| * | | | Misc bugfixesTor Norbye2012-06-1412-49/+97
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset fixes a number of unrelated minor issues: - Fix to the config composite such that changing the activity associated with the layout is sticky - Fix to the icon generator such that you can't select shape=none for notification icons - For the brief activity labels in the config composite, strip the outer class names for inner classes, e.g. from SessionLivestreamActivity$SessionLiveCaptionsFragment to SessionLiveCaptionsFragment. Also strip out "Activity" or "Fragment" from the suffix of the name if the name is long. - When creating a blank project and you're *not* creating an activity, don't create a dummy layout either. - Fix metadata for fragment and include such that you can convert one into the other using the Change Widget refactoring. - Fix bug where pulling up a hovering a lint tooltip, and then switching to the Java editor with the keyboard would leave the tooltip on the screen. - Only show lint tooltips and overlay icons if lint-on-save is enabled - Workaround Eclipse 4.x issue where switching between maximized layout editors would cause the structure view to be hidden Change-Id: I68aee8967e5fe5deb0f30c071f4c395966aa6304
* | | | Merge "Dependency support for the templates"Tor Norbye2012-06-1517-35/+514
|\ \ \ \ | |_|/ / |/| | |
| * | | Dependency support for the templatesTor Norbye2012-06-1417-35/+514
| | | | | | | | | | | | | | | | Change-Id: Id6b0e5f65fc3a50b352423623332c47f7ab5085d
* | | | Merge "Add format handling to the template wizards"Tor Norbye2012-06-159-31/+97
|\ \ \ \ | |/ / /
| * | | Add format handling to the template wizardsTor Norbye2012-06-149-31/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset adds a format attribute to the templates. When the ADT plugin reads a template file, and the format version is a higher number than one it knows about, it rejects the templates and informs the user to upgrade the plugin. This allows us to change the format of the templates incompatibly in the future without worrying about users with older versions of the plugin running into problems (because they upgraded the tools but not ADT). It also adds a revision number to each template which is used for the opposite purpose: we can tell if a template is a slightly older revision and then do some conditional handling. Change-Id: If6c49012a1beca44c3a05b3e880ffde70294a57e
* | | | Merge "Update templates"Tor Norbye2012-06-1522-27/+116
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Update templatesTor Norbye2012-06-1422-27/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset updates the activity templates with new versions from Roman. Also fixes a couple of bugs he ran into: the camel case to underscore conversion methods were reversed, and the template test wizard didn't reset the activity template once the second page was shown. Change-Id: I353af646f92f37bf2a9827d0dc68a409dd9358bc
generated by cgit v1.1 at 2025-01-28 09:47:57 +0000