| bd9d2bcdebfa66a0f71fa67aa256dcae4ccd93da |
|
16-Oct-2011 |
Dianne Hackborn <hackbod@google.com> |
Whoops, remove left-over debug output.
Change-Id: Ib30571b22a6750629f975319a403d38de5e9462c
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| e6b680364dd992907a8d2037685a2e500d188dfb |
|
14-Oct-2011 |
Dianne Hackborn <hackbod@google.com> |
New aapt feature to do smarter filtering of configurations.
This adds a --preferred-configurations flag that specifies the
specific configurations you would like to have.
It is smarter than "-c" because it will avoid stripping a
configuration if that would result in there being no value
for the resource.
It is dumber than "-c" because it can't process as many kinds
of resources. It is really only intended for bitmaps and use
with density configs.
This required re-arranging AaptAssets to group files together
by config again, like they used to be. I think this hasn't
broken anything. Hopefully.
Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| a125c937de06b1cc43368743592f47513eb88b76 |
|
21-Jul-2011 |
Xavier Ducrohet <xav@android.com> |
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
|
| 9139868b6c5cb29b3665984225dceb0193fec31d |
|
19-Jul-2011 |
Xavier Ducrohet <xav@android.com> |
am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"
* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
Add dependency generation to Aapt for R.java
|
| 03589cc65355220e0a4a0c816189a9fa25cc81fc |
|
28-Jun-2011 |
Josiah Gaskin <josiahgaskin@google.com> |
Add generation of dependency file for .ap_ package
Make Aapt generate a dependency file in the same directory as the
output ap_ file if the --generate-dependencies flag is set.
This dependency file can then be read by the ant exec loop task
to see whether to repackage resources.
Change-Id: I763679414daf76369700aa599c26dcf78d4de099
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9bf34ca6f85309c65b0ebdf614cb8266401b49ba |
|
14-Jun-2011 |
Josiah Gaskin <josiahgaskin@google.com> |
Add dependency generation to Aapt for R.java
Make Aapt generate a dependency file in the location specified
by RClassDir for R.java if the --generate-dependencies flag is set.
This dependency file is then read by the ant exec loop task
to see whether to recreate R.java.
Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| b96cbbd11c4590bec846212c33361e02293f18b5 |
|
27-May-2011 |
Dianne Hackborn <hackbod@google.com> |
Add "tv" density for 720p screens.
Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| e360bb6bd8ea84b8d37604fc11dfc744b18fb0de |
|
21-May-2011 |
Dianne Hackborn <hackbod@google.com> |
Add "television" mode.
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 69cb87576ba163b61bb0e6477a3b7c57a9b11d40 |
|
20-May-2011 |
Dianne Hackborn <hackbod@google.com> |
Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| ebff8f92f13513ce37bd74759eb1db63f2220590 |
|
13-May-2011 |
Dianne Hackborn <hackbod@google.com> |
DO NOT MERGE. Integrate add new screen width/height in "dp" configs.
You can now specify resource configuration variants "wNNNdp"
and "hNNNdp". These are the minimum screen width/height in "dp"
units. This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.
This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes. Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted. To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.
Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 5ef0b9d72451d4bb65f5a76a05738041ed15664a |
|
09-Nov-2010 |
Johan Redestig <johan.redestig@sonyericsson.com> |
Make AaptGroupEntry::getMncName accept mnc00
MNC 00 is a valid network code and is used by
some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code.
Remove the test that checks if atoi returns zero.
The string is validated to contain only numbers
already.
Also discussed here:
https://code.google.com/p/android/issues/detail?id=3657
Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 588f228d6a3e3b254fbc1f13f29ee47e13a669c1 |
|
13-Aug-2010 |
Ficus Kirkpatrick <ficus@android.com> |
Add --max-res-version flag to aapt.
aapt will ignore any versioned resource directories over the
specified version (if used). e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.
Merged from froyo.
Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 168585ed68f03ddc851cd734cbb6ba813e30eb85 |
|
06-Jun-2010 |
Dianne Hackborn <hackbod@google.com> |
am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken
* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
xhdpi
|
| 588feee5e771de5ec71da213fbb1cba29392c690 |
|
04-Jun-2010 |
Dianne Hackborn <hackbod@google.com> |
xhdpi
This is only a tool (aapt) change, and does not impact any current code.
Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 14cee9f688c32d63d8521188e7422811629bb7c2 |
|
24-Apr-2010 |
Dianne Hackborn <hackbod@google.com> |
New xlarge screen size.
Not complete, only for experimentation at this point.
This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.
The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.
Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 7299c41630935a2b106e73e5603579a7747f7535 |
|
05-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Refactor car mode.
Extract all UI behavior from dock observer and ACTION_DOCK_EVENT.
Also introduce a desk type to go along with the car type all through
the resource system, since we now need to have corresponding high-level
broadcasts for desk dock mode. As part of that I also reworked some
of the logic for switching modes to all funnel through a single
update() call that looks all of the current state to decide what to
do next, and fixed various locking issues.
In addition I found there were bugs in the configuration change
handling causing us to only switch into the car mode config and
then never get out of it. Unfortunately now that we are actually
changing the configuration for each mode change, the transitions
between them are really crummy as we restart all kinds of
activities. :(
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| ef05e076ced1a32c5c0aaee28403779834adb2ba |
|
02-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| e599f78e7785d41902d7525c71d487b36d8ccca2 |
|
19-Feb-2010 |
Kenny Root <kroot@google.com> |
Use direct reference to enum in AaptAssets
The second argument to the getNavHiddenName can be NULL, so use a direct
reference to the class to get the enum values instead of the argument.
Change-Id: I0444572c23cb4de9e7da15a8310a49cf4619bb15
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| fedfea24e7de98b4fde13d6f79e6db37d9f0e169 |
|
18-Feb-2010 |
Kenny Root <kroot@google.com> |
Fix enum reference
Was using argument that is set default to NULL as a shortcut to an
enum's value. Change it to reference to class directly to avoid a null
pointer dereference.
Change-Id: I16b8ee15af4f095f027113131d574b70768994b0
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 27b28b3f62bd3b54fa13acd5d035940b9be464f3 |
|
09-Feb-2010 |
Tobias Haamel <haamel@google.com> |
Introduce special UI modes for night and car usage.
The device mode is now called ui mode. Furthermore is the order of
precedence for the resources now in such a way that the ui mode needs
to be specified after the orientation and before the density.
The ui mode can be set, like it is done for the locale, as follows:
IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY;
am.updateConfiguration(config);
To allow users to disable the car mode and set the night mode the IUiModeManager
interface is used.
The automatic night mode switching will be added in a separate change.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 3cdfc042dca4264bdd2e51320f7edb81fd8f9ee0 |
|
25-Sep-2009 |
Raphael <raphael@google.com> |
AAPT: Ignore visual source safe files in resources
BUG 1895888
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 93e462b79d6896da10e15e74c5aec6beb098dddf |
|
16-Sep-2009 |
Dianne Hackborn <hackbod@google.com> |
Implement issue #1780928: Need support hiding nav keys.
This implements support for devices whose hardware can hide
their navigation keys. It works much like the existing keyboardHidden
configuration, and for compatibility uses the same configuration
change bit.
Also add FLAG_TURN_ON_SCREEN for windows, which has the system
cause the screen to be turned on when the window is displayed.
Great fun when used with FLAG_SHOW_WHEN_LOCKED!
Change-Id: I0b867f19af85cfd8786a14cea194b34f7bdd9b7a
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 1553c82e084ac5763fb393857224145506771b99 |
|
30-Aug-2009 |
Joe Onorato <joeo@android.com> |
Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| c4db95c077f826585d20be2f3db4043c53d30cf5 |
|
22-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
First pass at reworking screen density/size APIs.
This changes the names of the directories in aapt, to what you see
in the list of DpiTest resources. Also adds a new "long" configuration
for wide screens, which the platform sets appropriate, and introduces
a new kind of resizeability for not large but significantly larger
than normal screens which may have compatibility issues.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| a53b828635fce8b6b2d3e3377d74d72070056623 |
|
17-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Add "nodpi" density, and expose a bunch of density-related APIs.
Also update the DpiTest app to use nodpi images, and try to have a mode
where it turns off compatibility though it's not quite working.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 723738cfaec3dd7b0fe152c872c41bebf94074c4 |
|
26-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
Expand support for different screen sizes.
Applications can now declare that they support small, normal, or
large screens. Resource selection can also be done based on these
sizes. By default, pre-Donut apps are false for small and large,
and Donut or later apps are assumed to support all sizes. In either
case they can use <supports-screens> in their manifest to declare
what they actually support.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9266c558bf1d21ff647525ff99f7dadbca417309 |
|
16-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@126645
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/tools/aapt/AaptAssets.cpp
|