aboutsummaryrefslogtreecommitdiffstats
path: root/assetstudio
Commit message (Collapse)AuthorAgeFilesLines
* Update compiler flags.Tor Norbye2012-10-261-2/+2
| | | | | | | | | | Turns off the ability to use @SuppressWarnings with optional errors is available, but off by default (see Eclipse issue 392875). This turns that off, makes missing enums in switch statements a warning, and synchronizes the settings file to all projects (except tests.) Change-Id: Iad7060523b6ee2cbbca97e0a6ffedb264b185222
* Update Guava from 10.0.1 to 13.0.1Tor Norbye2012-08-291-1/+1
| | | | Change-Id: Ia51e3e2280c3d360496550df50a540571b9b7582
* Merge "Disable padding for action bar icons created from clipart."Roman Nurik2012-08-101-2/+7
|\
| * Disable padding for action bar icons created from clipart.Roman Nurik2012-08-081-2/+7
| | | | | | | | | | | | | | This disables the automatic padding (target rectangle) used by the asset studio when using clipart as the source image. Change-Id: Ic5992773207c92426a9f37409536d74b81dd645b
* | Refactor common.jarXavier Ducrohet2012-08-073-4/+7
|/ | | | | | | | | | | | | | | Move resources and com.android.util.Pair into layoutlib_api where they belong since layoutlib depends on them and we need to control the API. Made a copy of Pair to stay in common.jar but moved it to com.android.utils.Pair (the one in com.android.util.Pair is marked as deprecated to prevent usage where applicable). Also moved XmlUtil and PositionXmlParser to com.android.utils to match Pair. Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89
* Asset studio fixesTor Norbye2012-08-063-4/+22
| | | | | | | | | | | | When generating actionbar icons from clipart, do not strip surrounding space, and do not add extra padding. The clipart images already contain baked in padding suitable for action bar icons. This CL also makes sure the UI disables the corresponding options in this mode. It also renames and moves to the bottom the legacy menu and tab icon generators, and fixes a file resource leak in the image loading code. Change-Id: I8a0dd61c97862206cdc71dc591a207a0b6a050f8
* Fix Asset Studio tests by adding back Bugdroid clipart.Roman Nurik2012-08-062-0/+0
| | | | Change-Id: I50a82edca0e24326da8666c8d2a7080bfe6168bc
* Replace asset studio clipart with action bar icon pack.Roman Nurik2012-08-06328-0/+0
| | | | | | | This replaces all current clipart for the Asset Studio with icons from the Action Bar Icon Pack on developer.android.com/design/downloads. Change-Id: I8d1307567602ebcadd5c2f2e043580ba94dc5614
* Add support for icon generators in templatesTor Norbye2012-07-271-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds an <icon> element to the template xml file which allows the template to request the icon generator to be chained to the wizard to generate icons instead of using hardcoded ones. The variable ${copyIcons} will be set in the template context if for some reason the icons were not generated (for example, because the surrounding template infrastructure does not support icon generation.) Example: <globals file="globals.xml.ftl" /> <execute file="recipe.xml.ftl" /> + <icons + type="notification" + name="${activityToLayout(viewClass)}" + background="#ff00ff" + foreground="#ffff00" + shape="square" + trim="true" + padding="5" + /> This CL also removes some obsolete code from the graphic generators and wizards, and changes the default icon used by new projects from the white circle with a blue shape to the default packaging icon (which you can then further customize.) Change-Id: Ia039bf511b9939d01e16265449c1ad6c930279c2
* Ignore xxhigh density in Asset Studio.Xavier Ducrohet2012-07-131-1/+2
| | | | Change-Id: I1cf4c6e2f28759fa87652e44b9343ae985fed9f9
* Fix warningsTor Norbye2012-06-011-0/+5
| | | | | | | | | | | | | | | | | 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
* Asset Studio: Add no-background option, and support embeddingTor Norbye2012-05-082-9/+22
| | | | | | | | | | | | | | | | | This changeset improves the asset studio wizard in two ways: - First, it adds support for having no background shape (which the web version has added) - Second, it adds a "value holder" class which holds the current (as well as initial) state of the various configuration parameters for the icon generator. This allows the same code to be used to generate icons programatically, and also allows reuse of the asset studio wizard pages in different wizards and with custom initial state. For example, the New Project wizard can now embed the asset studio page and preconfigure it to generate launcher icons. Change-Id: I9eac396325214af8309447083ff9dcb9e59645ab
* ICS clipart from Roman. Also re-enable clipart option in UI.Tor Norbye2012-01-2743-0/+0
| | | | Change-Id: Icd4fe670bbabc9413256b3b5b4631b45dbcc3134
* Update asset studio unit test golden filesTor Norbye2012-01-2664-7/+9
| | | | | | | This tracks the recent upgrades to the asset studio asset generators (c83ea5b06bf11d511ea26de1ec0ac1e9023732ea) Change-Id: I27c7da25ac704ac82f7eed90f1e36896b0b5124d
* ADT: Asset Studio library updates for ICSRoman Nurik2012-01-237-84/+58
| | | | | | | | Updates the action bar and status bar icon generators to better conform to the design guidelines. Also switches scaling logic to use an MDPI baseline rather than an HDPI baseline. Change-Id: I21c23d308f57157f1d2c02ddded143a5da188f85
* Add @NonNull annotation and configure Eclipse settingsTor Norbye2011-12-221-1/+13
| | | | | | | | | | | | | | This changeset adds a new @NonNull annotation, to match our existing @Nullable annotation, and it adds configuration settings for Eclipse 3.8 / Eclipse 4.2 which configures the new null analysis there to use our own annotations. Note that the annotations only have source retention so there is no extra size or class-loading overhead. (To use findbugs you'll need to temporarily change retention to class-level.) In upcoming CL's I'll use these annotations to clarify the Lint API and other APIs. Change-Id: I99096d8b8a7e25ef002624d592da7700195a5872
* Update SDK codebase to JDK 6Tor Norbye2011-12-213-1/+13
| | | | | | | | | | | | | | | | | | | | | This changeset makes the SDK codebase compile with source=1.6 (which means it also requires JDK 6). This means that methods implementing an interface requires @Override's. It also means we can start using APIs like the ArrayDeque class and methods like String#isEmpty(). This changeset looks big but the change is trivial: it's basically adding @Override in all the places that need it, along with some other automatic Eclipse cleanup in certain files (such as reordering imports where they were incorrectly ordered (because older versions of Eclipse didn't always handle inner classes right)), as well as cleaning up trailing whitespace and removing some $NON-NLS-1$ markers on lines where there aren't any string literals anymore. This changeset also sets the source and target JDK level to 6 in the Eclipse compiler .settings file, and synchronizes this file to all the other Eclipse SDK projects. Change-Id: I6a9585aa44c3dee9a5c00739ab22fbdbcb9f8275
* Update Asset Studio launcher icon stencils per UX specRoman Nurik2011-09-2831-11/+11
| | | | | | | | | Per discussion with the Android UX team, we've decided to update the spec for launcher icons. In a future update we will change some of the underlying behavior to provide more shapes and allow freeform shapes. Change-Id: Idf575230c7c649299c7368209dfee5e7a0638fad
* Use project minimum SDK to generate fewer iconsTor Norbye2011-09-0125-26/+73
| | | | | | | | | | | | | This changeset makes the icon generator consider the project's minimum SDK version, to only create necessary icons. For example, by default the tab icon generator will generate different icons for v5 and newer and folder older icons. With this CL, if the minimum SDK is 5 or higher, then only the newer style icons are created (and they are placed in the default drawable folder instead of a -v5 version of the folder). Similarly, notification icons for v11, v9 and older are also created conditionally. Change-Id: Id96d572d4b8f23cd59d0f1b983c6aea85683eb0f
* Add support for remaining asset types in Asset Studio WizardTor Norbye2011-09-0185-127/+1221
| | | | | | | | | | | | | | | | | | | | This changeset ports the remaining graphic generators from the HTML5 version (notifications, tabs, action bar), and hooks up wizard support for them. It also adds unit tests for the generators which generates images and compares them to known good versions. I ran these tests comparing them to the output from the HTML5 version of Asset Studio and all but 3 of the images varied less than 5% (and I verified the remaining manually and they're all fine and the difference is due to the images being aligned slightly differently.) The icon wizard is now also hooked up to the "New" button in the Resource Chooser for drawable resources, and this changeset also fixes a few related issues ("New" didn't work for file-based resources, and newly created resources weren't showing up in the selection list.) Change-Id: I48c49f1d5de452aa5b78e491d9b07e7156397fa9
* Add clipart support to the asset set wizardTor Norbye2011-08-023-0/+80
| | | | | | | | | | | This changeset adds clipart support to the asset set wizard. There is only one placeholder clipart image now but the code reads the available images from the jar dynamically. This changeset also adds "file exists - replace yes, no, always, never" handling for the generated icons. Change-Id: I38d0c40957eff4a9e844e29d61f2c57493bd10f0
* Add a text rendering utility class to the Asset Studio library.Roman Nurik2011-07-282-4/+114
| | | | | | | | | Add a text rendering utility class to the Asset Studio library. Also fix a tiny edge-case bug in image scaling. The text rendering class allows rendering a String with some options to a BufferedImage, for input as the sourceImage to a GraphicGenerator. Change-Id: I8e17e9a25ac2e48fa55e2994706aeb572da54223
* Asset Studio wizardTor Norbye2011-07-2760-26/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | This is an initial integration of the Android Asset Studio into Eclipse, as a New Asset wizard. It uses the Java port of the Android Asset Studio to generate the assets: https://code.google.com/a/google.com/p/android-asset-studio-java/ It only supports launcher icons, and some of the configurable parameters (file, shape, crop). To run it, put the AssetStudioLib.jar file into the the adt libs directory. There's a new "Asset Set" wizard in the New wizard, which will open up a two page wizard; the first page lets you select the project (which it attempts to pick up from context), as well as the type of asset to create, and the asset output name. In the second page there are the various widgets to tweak the code generator, and a preview area on the right which updates as you tweak the various controls. The main remaining work is to support additional asset types as they are added to the assetstudio generator library. Change-Id: I2e556337f8e5c3bc09e84b35a342ba05110abebc
* Initial commit for the Asset Studio library in the SDKRoman Nurik2011-07-1655-0/+714
Change-Id: I8f0aa6283af03c64c3563530defcf57ee2238bd8