972 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
c9fe6568f3 am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."
* commit '9e22d9c514457c4b163d03b9241e4e28b1698368':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
2012-06-05 18:43:49 -07:00
Ying Wang
41bdb03ffb Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails
right away with the error "Too many open files" when calling fopen().

Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76
2012-06-05 14:30:39 -07:00
Tor Norbye
44ff9b8f92 am 36ac43ba: Merge "Tweak default ignore-assets path"
* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
  Tweak default ignore-assets path
2012-06-05 08:41:16 -07:00
Tor Norbye
e0219c8baa 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
2012-06-04 10:41:38 -07:00
Jean-Baptiste Queru
3df4e1a2f1 am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
* commit '0748a5698776d1a9693a5449ffc983af26cc533b':
  aapt: Remove terminal pointer incrementaion
2012-06-02 09:56:45 -07:00
Jean-Baptiste Queru
0748a56987 Merge "aapt: Remove terminal pointer incrementaion" 2012-06-02 09:21:37 -07:00
Ying Wang
98a0607a31 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
2012-05-24 11:07:14 -07:00
Raphael Moll
613945011e Merge "Support a new ANDROID_AAPT_IGNORE env var." 2012-05-18 13:00:31 -07:00
Jean-Baptiste Queru
c0f1738357 Merge "Move kxml2 to prebuilts/misc" 2012-05-18 09:51:04 -07:00
Raphael Moll
90897ed87b 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
2012-05-09 21:16:26 -07:00
Jean-Baptiste Queru
b2228eb714 Merge "Runtime resource overlay: clean-up." 2012-05-01 09:20:32 -07:00
Jean-Baptiste Queru
9e3bc3f61d Merge "Build overlay packages just like regular packages." 2012-05-01 08:49:38 -07:00
Jean-Baptiste Queru
bda124453d Move kxml2 to prebuilts/misc
Change-Id: Ie4b45d2073f26d8313843f9860cf658e288c850b
2012-04-30 17:35:26 -07:00
Nobuhiro Hayashi
c4293c1408 aapt: Remove terminal pointer incrementaion
When initialization, 'end' pointer refers terminal
character in a string. But it is incremented in
while loop. It occurs the access to non-secure memory.

Issue detail
  http://code.google.com/p/android/issues/detail?id=24896

Change-Id: I751d1154d797738c87a66374a66933528c045be5
2012-03-30 19:23:04 +09:00
Xavier Ducrohet
f038868d74 am 44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
  Support rendering layout that use the new res-auto namespace.
2012-02-24 19:32:47 -08:00
Xavier Ducrohet
44e63a218c Support rendering layout that use the new res-auto namespace.
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
2012-02-24 19:29:31 -08:00
Dianne Hackborn
e65a9ab1ea am 5786f5cf: Merge "Fix build." into ics-mr1
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
2012-02-24 16:24:40 -08:00
Dianne Hackborn
5786f5cf1b Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
b69b2c01b4 Fix build.
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
2012-02-24 16:10:26 -08:00
Xavier Ducrohet
b3c780f16c am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.
2012-02-23 18:42:01 -08:00
Xavier Ducrohet
816b873df1 Move the automatic namespace outside of the res namespace. do not merge.
(cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225)

Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
2012-02-23 18:10:20 -08:00
inazaruk
eed8d0b3af Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.

Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>

(cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18)

Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
2012-02-23 18:09:31 -08:00
Jean-Baptiste Queru
fe99051c78 am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
  Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 12:59:22 -08:00
Jean-Baptiste Queru
0e25e4cd29 am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" 2012-02-23 12:38:14 -08:00
Xavier Ducrohet
22701ec5b1 am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
  Make sure resource references are resolved.
2012-02-22 10:49:15 -08:00
Xavier Ducrohet
c3f979f6fe Make sure resource references are resolved.
XmlPullAttribute can query for attributes and return them in a given
format. We need to make sure they are first resolved before
trying to convert them to int/float/boolean/...

Change-Id: I2aaced022a0382e501978c396e49d6191d53bdc8
2012-02-21 14:33:37 -08:00
Mårten Kongstad
249e3ed540 Runtime resource overlay: clean-up.
This is a combination of three minor clean-up tasks:

- Generate correct idmap even if name lookup fails:

  Any resources following a resource with a spec but no actual values
  would receive an incorrect ID in the idmap due to an accumulating offset
  error. To combat this, a dummy value is inserted in the idmap whenever
  a resource with a spec but no values is encountered.

- Optimize pruning of padding zeroes in idmaps:

  Earlier, trailing zeroes were iteratively popped from the end of each
  type block of an idmap. This commit instead tracks where to make the
  cut, and does so with a single function call.

- aapt: warn about resources which lack values:

  The resource framework assumes every resource to have a value for
  at least one valid configuration. However, if multiple resource
  directories are used (several -S options to aapt), the list of
  configurations is limited by dpi (-c option to aapt) and a resource
  is only available in discarded dpi configurations, aapt will create
  a resource entry where each configuration lack an actual value. This
  commit lets aapt emit a warning whenever this has happened.

Change-Id: Ic7451b7f4adfef5bfa6b0d7e64e057f317a2cdaa
2012-02-16 16:43:07 +01:00
Mårten Kongstad
c761d8b008 Build overlay packages just like regular packages.
Previously, building overlay packages required passing aapt its -o flag.
This commit decouples the idmap generation code from the effects of the
-o flag.

Since this commit renders the -o flag obsolete, support for the flag was
removed from aapt as well.

Change-Id: Ied2e0ab8cb800e49623f0a2044b06cd4935473d5
2012-02-07 19:14:28 +01:00
Xavier Ducrohet
b1f95c6a93 am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
  Setup ActionBars in layoutlib the same way the platform does it. do not merge.
2012-02-06 16:42:56 -08:00
Xavier Ducrohet
331bb0c393 Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Instead of using a simple ImageView for the icon, this uses the platform
layout/action_bar_home which uses a custom class to position and resize
the icon (and also supports the Up icon that we don't yet support).

This ensures that the icon is properly positionned and sized like
on devices.

(cherry picked from commit 7396348dfcfb45b7ad055f4c18cabbe5e8270d26)

Change-Id: Ifd3bc318089b70ba843519523e366e59d434e919
2012-02-06 16:40:03 -08:00
Xavier Ducrohet
b54f371cc4 am f8aea993: Make aapt ignore tools-related data.
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
  Make aapt ignore tools-related data.
2012-02-06 11:41:56 -08:00
Xavier Ducrohet
f8aea99385 Make aapt ignore tools-related data.
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.

The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.

(cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a)

Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
2012-02-06 11:25:28 -08:00
Jean-Baptiste Queru
12b7da6995 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
f3f650db96 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
08d3c6e5ba am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
7ae84204c1 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
2012-01-19 17:25:58 -08:00
Jean-Baptiste Queru
97aa8ee811 Merge ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
2012-01-19 17:18:25 -08:00
Steve Block
c6aacce371 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
2012-01-19 14:45:03 -08:00
Steve Block
a51f0e707f Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
2012-01-19 14:44:59 -08:00
Steve Block
933e856150 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
2012-01-19 14:44:56 -08:00
Steve Block
1afd5bab4e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
2012-01-19 14:44:50 -08:00
Steve Block
06ade6ae1b Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
2012-01-19 14:44:31 -08:00
Jim Miller
93c518e4f8 Fix 5863053: Add method to lock screen immediately.
This fixes a bug where the device fails to lock when DevicePolicyManagerService
requests the device to be locked and the screen was off because the user hit
the power button.

The change allows DPMS to directly invoke screen lock, bypasssing the screen state.

Change-Id: Iecdda6fc61e9c519119de495be23c69c3b983921
2012-01-17 18:11:05 -08:00
Raphael
7c3bef85da Merge "AAPT fix printf %zd crash on Windows". Do not merge.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Bug: 5742142

(cherry picked from commit f51125d8429ffa71c57ba6fbdca9effc72642a9b)

Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1
2011-12-11 13:59:02 -08:00
Dianne Hackborn
6d05fd3c79 Fix issue #5588689: Black camera preview after coming back from gmail
Make surface management between SurfaceView and the window manager
much more controlled, to ensure that SurfaceView always gets to report
the current surface is destroyed before the window manager actually
destroys it.

Also a small tweak to allow windows that have a wallpaper background
to still have a preview window.  This makes launching home after it
has been killed feel much more responsive.

Change-Id: I0d22cf178a499601a770cb1dbadef7487e392d85
2011-11-28 14:45:50 -08:00
Iliyan Malchev
64ef6b47e0 add -ldl to host executables
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-20 16:21:25 -07:00
Daniel Sandler
0c4ccff369 Add hasNavigationBar() to the window manager.
It is no longer sufficient to check the value of
internal.R.bool.config_showNavigationBar to determine if a
navigation bar (separate from the status bar) is shown on a
device, because the emulator needs to be able to override
this value (now possible by setting qemu.hw.mainkeys to "1"
or "0", for navbar or no navbar, respectively).

This logic is now contained in PhoneWindowManager, and any
clients wishing to know whether the system has a software
nav bar should consult the new hasNavigationBar() method.

Bug: 5404945
Change-Id: I119d32a8c84b88b2ef46f63244e7f11dc5de0359
2011-10-19 16:39:14 -04:00
Dianne Hackborn
bd9d2bcdeb Whoops, remove left-over debug output.
Change-Id: Ib30571b22a6750629f975319a403d38de5e9462c
2011-10-16 14:17:07 -07:00
Dianne Hackborn
e6b680364d 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
2011-10-16 11:52:17 -07:00