| 40e8eefbedcafc51948945647d746daaee092f16 |
|
16-Sep-2014 |
Adam Lesinski <adamlesinski@google.com> |
First commit of split-select tool
This tool emits a set of rules as JSON for when a Split APK
should match a target device.
Change-Id: I8bfbdfbdb51efcfc645889dd03e1961f16e39645
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| ad2d07d2d98a46babb2a9472413fe9ce5080ca76 |
|
28-Aug-2014 |
Adam Lesinski <adamlesinski@google.com> |
Stamp platform version code into app Apks
The versionCode of theframework resources that an app is built against
gets stamped inside an app's AndroidManifest.xml in the <manifest>
tag as "platformBuildVersionCode" and "platformBuildVersionName"
attributes.
Bug:17207635
Change-Id: Id573c3dffcbca38eec9c0eb3e89f4a547e3361d3
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 48f05d29f398576c76b2c3b47a22f4e44e8919fc |
|
13-May-2014 |
Adam Lesinski <adamlesinski@google.com> |
Add better error message for AAPT file conflicts
Some resource directories may be the same even though
their names are different. For instance, the
"smallest width" qualifier was added in API 13,
so the resource directory "values-sw600dp" and
"values-sw600dp-v13" are the same and cause
a conflict. The error reports that this might be the
case.
Change-Id: Ia35f1d670edd48265b3a7fe3d55656128421f612
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 833f3ccbc8f4dd1ec8abb9121988b99ff34ec4c1 |
|
19-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
AAPT support for feature splits
This change allows the developer to add a base package for
which to build a feature split. The generated resource types
will begin after the base APK's defined types so as not
to collide or override resources.
Multiple features can be generated by first choosing an
arbitrary order for the features. Then for each feature,
the base APK and any preceding features are specified
with the --feature-of flags.
So with a base APK 'A' and features, 'B', and 'C',
'B' would be built with
aapt package [...] --feature-of A [...]
and 'C' would be built with
aapt package [...] --feature-of A --feature-of B [...]
Change-Id: I1be66e3f8df9a737b21c71f8a93685376c7e6780
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| b0db8de73e6e4151b4e9d1fe3be1f609c3c1fb83 |
|
06-Jun-2014 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Fix issue preventing aapt from stripping all unwanted densities
Bug: 15463874
Change-Id: I9d1e289f1db2ed3c9a41d91caea6d07b69fcb84f
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| fab50875b98e8274ac8ee44b38ba42521bbbf1f9 |
|
16-Apr-2014 |
Adam Lesinski <adamlesinski@google.com> |
Add support for building split APKs
Build multiple APKs, each containing a disjoint subset
of configurations. These can then be loaded into the device
AssetManager and should operate as if they were never split.
Use the idea of building multiple sets of files, where each
set represents an APK. An ApkBuilder can place files
in a set based on its configuration, but you can actually
add directly to a set, in the case of the resources.arsc and
generated AndroidManifest.xml for splits.
Change-Id: Ic65d3f0ac1bbd290185695b9971d425c85ab1de3
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec |
|
04-Apr-2014 |
John Spurlock <jspurlock@google.com> |
am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
|
| 642421aa7f284817cc1a972a7f9c7a64696a0116 |
|
04-Apr-2014 |
John Spurlock <jspurlock@google.com> |
am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
Introduce new UI_MODE_TYPE_WATCH and qualifier.
|
| 6c191299a73388cd593809c0b66bafbd08fd2982 |
|
03-Apr-2014 |
John Spurlock <jspurlock@google.com> |
Introduce new UI_MODE_TYPE_WATCH and qualifier.
Default ui mode to watch if we have FEATURE_WATCH.
Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| de898ff42912bd7ca1bfb099cd439562496765a4 |
|
30-Jan-2014 |
Adam Lesinski <adamlesinski@google.com> |
Shared library resource support
Shared libraries can now export resources for applications
to use.
Exporting resources works the same way the framework exports
resources, by defining the public symbols in res/values/public.xml.
Building a shared library requires aapt to be invoked with the
--shared-lib option. Shared libraries will be assigned a package
ID of 0x00 at build-time. At runtime, all loaded shared libraries
will be assigned a new package ID.
Currently, shared libraries should not import other shared libraries,
as those dependencies will not be loaded at runtime.
At runtime, reflection is used to update the package ID of resource
symbols in the shared library's R class file. The package name of
the R class file is assumed to be the same as the shared library's
package name declared in its manifest. This will be customizable in
a future commit.
See /tests/SharedLibrary/ for examples of a shared library and its
client.
Bug:12724178
Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 8c1fc83445f8dce7e6d0789feeed8bf98d33bf01 |
|
17-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
Extended locales in AAPT / AssetManager.
|
| 788fa41482b9d398591b7db8b0b01839029611ad |
|
21-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.
This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.
This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.
Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.
(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)
Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 91447d88f2bdf9c2bf8d1a53570efef6172fba74 |
|
21-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.
This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.
This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.
Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.
Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 94c40a4cf90933216e6d656213dfdfa19c68a9c3 |
|
04-Feb-2014 |
Adam Lesinski <adamlesinski@google.com> |
resolved conflicts for merge of 1b5b60d6 to master
Change-Id: I2b713a55fcdf02c01afa99f175bf14248f210460
|
| 1b5b60d696dd6840406ab9d3f38522ba18273c60 |
|
04-Feb-2014 |
Adam Lesinski <adamlesinski@google.com> |
am 203356a3: Merge "Add support for multiple asset dirs (-A)" into klp-modular-dev
* commit '203356a34a82bfc759be02dfa1caa4529dce0732':
Add support for multiple asset dirs (-A)
|
| 7c4887f66bfa3dad16f8b03dc825ade96d7de130 |
|
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
(cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)
Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1 |
|
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
Change-Id: If7bfa1f640dddca39b9f26a3ce84081fa7b6e6e3
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9ab9b93eae8b2fc747d6101cf0e4c19b2218715f |
|
24-Jan-2014 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Filter unneeded assets from additional resource directories
This change ensures that assets that are not needed for the
preferred density are stripped from additional directories
specified by the -S flag
For simplicity, the logic for deciding which assets are not
needed is still applied per directory, rather than globally,
which may still result in some unneeded assets being included
in the final output.
Bug: 12604267
Change-Id: Ic1378570c2d9cd1c854c507e784233818c19efca
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 8cf61845187e301dfc4f64b42921977d38766a34 |
|
18-Oct-2013 |
Adam Lesinski <adamlesinski@google.com> |
Prune unneeded density resources from APK
When a preferred density is specified, prune all but the
closest matching density when the exact density resource does not
exist.
If a preferred density resource does not exist and a higher density
resource exists, prune all but the resource with the next highest
density relative to the preferred density.
If a preferred density resource does not exist and there is no
higher density resource, prune all but the resource with the next
lowest density relative to the preferred density.
Manual merge of I99b3950fe3d8116a5625968ed383442315ae8526 from
frameworks/base/tools to frameworks/tools
bug:11224465
Change-Id: Idddf55dad27f114ffc429b61317c3a5b1435d808
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 282e181b58cf72b6ca770dc7ca5f91f135444502 |
|
24-Jan-2014 |
Adam Lesinski <adamlesinski@google.com> |
Revert "Move frameworks/base/tools/ to frameworks/tools/"
This reverts commit 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e.
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 09384303dea4f3f01d5682918d7bab9bf83a02b1 |
|
23-Jan-2014 |
Adam Lesinski <adamlesinski@google.com> |
Add support for multiple asset dirs (-A)
Bug: 12608034
Change-Id: I02c5a1a73b83498d799570428cca3dd914f8ac11
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9438c2df133710ea2364e817cfd237f7a3d69ab1 |
|
16-Oct-2013 |
Adam Lesinski <adamlesinski@google.com> |
Prune unneeded density resources from APK
When a preferred density is specified, prune all but the
closest matching density when the exact density resource does not
exist.
If a preferred density resource does not exist and a higher density
resource exists, prune all but the resource with the next highest
density relative to the preferred density.
If a preferred density resource does not exist and there is no
higher density resource, prune all but the resource with the next
lowest density relative to the preferred density.
bug:11224465
Change-Id: I99b3950fe3d8116a5625968ed383442315ae8526
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9f6a119c8aa276432ece4fe2118bd8a3c9b1067e |
|
28-Aug-2013 |
Mike Lockwood <lockwood@google.com> |
Move frameworks/base/tools/ to frameworks/tools/
Change-Id: I3ffafdab27cc4aca256c3a5806b630795b75d5c8
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 1d766b53217f9e45472a01e84d2f1b02af36dec7 |
|
07-Oct-2011 |
Mattias Petersson <mattias.petersson@sonyericsson.com> |
Add support for MNC=00
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)
Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).
Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 56a2301c7a1169a0692cadaeb48b9a6385d700f5 |
|
13-Feb-2013 |
Dianne Hackborn <hackbod@google.com> |
Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!
Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 8a802dbdabdfd27692c2e38b2c3adafe95566106 |
|
05-Sep-2012 |
Fabrice Di Meglio <fdimeglio@google.com> |
Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
- we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3
codespace which uses 3 letters for identifying a language code (and could use either
"rtl" or "ltr" strings for defining a language in the future).
- we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers
are defined by more than 3 chars and outside of what is defined into ISO-639. They
are also more understandable as "ld" prefix is for "layoutdirection"
Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 5f7979993979466c79ab4f38d83c6f2aca361662 |
|
16-Jun-2012 |
Fabrice Di Meglio <fdimeglio@google.com> |
Add support for "-rtl" in resources
- fix bug #7035019 Need to have "-rtl" support for Resource
Change-Id: Ic82145c2ac672729d8a6c695a5f343276a1a0a2c
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 9f374b9de5a557a7977b24d41f45c3464cfff8c1 |
|
05-Jun-2012 |
Tor Norbye <tnorbye@google.com> |
am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
Tweak default ignore-assets path
|
| 44ff9b8f9294e015031fc9293974604771e5efdd |
|
05-Jun-2012 |
Tor Norbye <tnorbye@google.com> |
am 36ac43ba: Merge "Tweak default ignore-assets path"
* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
Tweak default ignore-assets path
|
| e0219c8baa9d63b3794f90ab772f1c19ecb74ec4 |
|
04-Jun-2012 |
Tor Norbye <tnorbye@google.com> |
Tweak default ignore-assets path
Add .DS_Store to the list of ignored files that are silently
ignored (other dot-files are ignored but aapt emits a "(skipping <x>)"
message.)
Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup
files.
Finally, move the !*.scc pattern up in front of the .* pattern, such
that it doesn't match the earlier .* pattern (which is verbose, unlike
!*.scc).
Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 98a0607a314a7a6023fabdafaa8e470a1e800c09 |
|
22-May-2012 |
Ying Wang <wangying@google.com> |
Merge "Fix length of pattern." DO NOT MERGE.
After skipping * with "token++", the length should decrease by 1 as
well.
(merged from 996b073e813ba1a22a13282ccdebb664f14ba898)
Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 996b073e813ba1a22a13282ccdebb664f14ba898 |
|
22-May-2012 |
Ying Wang <wangying@google.com> |
Fix length of pattern.
After skipping * with "token++", the length should decrease by 1 as
well.
Change-Id: I132eb7d12bb756f2f713c607e92741ca834aef81
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 6c255a3a378143af59021d29b4980b28f1ab4544 |
|
08-May-2012 |
Raphael Moll <ralf@android.com> |
Merge "AAPT: support a new --ignore-assets flag."
AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.
Added a command-line option for it:
aapt di --ignore-assets "foo*:*.blah"
If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.
Otherwise a default is used that matches the current behavior.
SDK Bug: 5343 24067
(cherry-pick from AOSP 90897ed87bce639bf6bb2ccf15fbabb59b131bab)
Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 90897ed87bce639bf6bb2ccf15fbabb59b131bab |
|
08-May-2012 |
Raphael Moll <ralf@android.com> |
Support a new ANDROID_AAPT_IGNORE env var.
AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.
If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.
Otherwise a default is used that matches the current behavior.
Added a command-line option for it:
aapt di --ignore-assets "foo*:*.blah"
SDK Bug: 5343 24067
Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 1644c6d7f4931d0b4fe7ea77c63b016af01a46d3 |
|
07-Feb-2012 |
Dianne Hackborn <hackbod@google.com> |
Only generate private symbols that are needed.
Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| d96e3dfa02b203b1fc826e80d6f9aa074ba9c250 |
|
26-Jan-2012 |
Dianne Hackborn <hackbod@google.com> |
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 44fcb83b38b062a650ddf556fe7f5e34905df9ea |
|
15-Dec-2011 |
Joe Onorato <joeo@google.com> |
Add a new ui mode for "appliance"
The idea is that this is a device which is more-or-less headless. It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.
Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
/frameworks/base/tools/aapt/AaptAssets.cpp
|
| 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
|