436 Commits

Author SHA1 Message Date
Dianne Hackborn
8a44bb23c1 Update aapt to find fragment references.
Add knowledge about <fragment class="..."> for layout files
and update to reflect the change of the header tag from Header.

Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8
2010-08-20 12:56:42 -07:00
Ying Wang
af4798d9c3 am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0'

* commit '8cfd3c01e4582a587765588c02234527e7808ca0':
  Output proguard keep flags for fragment classes.
2010-08-16 15:16:52 -07:00
Eric Fischer
fed762b944 am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79'

* commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79':
  Change aapt's warning message to suggest formatted="false", not "true".
2010-08-16 07:49:51 -07:00
Ying Wang
8cfd3c01e4 am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp

* commit 'e05184f271f9882a5bf828e353aea40e0c06ff69':
  Output proguard keep flags for fragment classes.
2010-08-13 15:29:04 -07:00
Ying Wang
e05184f271 Merge "Output proguard keep flags for fragment classes." into gingerbread 2010-08-13 15:26:21 -07:00
Eric Fischer
d22a1e896c am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp

* commit '244152bfb9020341953d3e541c85eb3961806378':
  Change aapt's warning message to suggest formatted="false", not "true".
2010-08-13 14:56:47 -07:00
Eric Fischer
244152bfb9 Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread 2010-08-13 14:54:15 -07:00
Eric Fischer
98ee11ddb7 Change aapt's warning message to suggest formatted="false", not "true".
True is the default and specifying it won't suppress the warning.

Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592
2010-08-13 14:49:55 -07:00
Ficus Kirkpatrick
41e567f7cf 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 gingerbread.

Change-Id: I71b889540380cb10bafb40f72582d3af785ae33a
2010-08-13 14:32:05 -07:00
Ficus Kirkpatrick
0f414272cc am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp

* commit '7525c2cfbbaa5c947c029008ef490e93a50c064f':
  Add --max-res-version flag to aapt.
2010-08-13 14:27:41 -07:00
Ficus Kirkpatrick
588f228d6a 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
2010-08-13 14:20:51 -07:00
Ying Wang
561a91824f Output proguard keep flags for fragment classes.
Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec
Bug: 2916847
2010-08-13 14:06:58 -07:00
Kenny Root
1f5a8d96da am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread
Merge commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a'

* commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a':
  Initial tool for OBB manipulation
2010-08-11 14:15:20 -07:00
Kenny Root
80328ba096 am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbread
Merge commit '8ea71511c64e61fe23004889ff7032f991a751c8' into gingerbread-plus-aosp

* commit '8ea71511c64e61fe23004889ff7032f991a751c8':
  Initial tool for OBB manipulation
2010-08-11 14:10:26 -07:00
Kenny Root
6e7ac5f0bc Initial tool for OBB manipulation
Add "obbtool" host command for adding, removing, and querying Opaque
Binary Blob (OBB) information from a file.

Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
2010-08-11 11:24:41 -07:00
Jean-Baptiste Queru
f252b3501e am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'

* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
  Fix build on some linux machines
2010-08-11 10:07:56 -07:00
Jean-Baptiste Queru
f781b4ef4b am e37ab632: Merge "Fix build on some linux machines"
Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp

* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
  Fix build on some linux machines
2010-08-11 10:04:31 -07:00
hmepas
b7ffaf6ae2 Fix build on some linux machines
This adds -lpthread on linux for aapt and localize, which appear to be
needed on some linux distros.

Signed-off-by: Jean-Baptiste Queru <jbq@google.com>
2010-08-11 09:08:51 -07:00
Romain Guy
1639351139 Make libhwui entirely optional.
The makefile variable USE_OPENGL_RENDERER must be set to true to compile
libhwui and the related code in the JNI layer.

This change also removes obsolete APIs from Canvas that must not be used
and would be confusing if left in. These APIs were remnants of our first
attempt at an OpenGL renderer for the view hierarchy and had not been
taken out before Android 1.0 was released.

Change-Id: I2475ff1307212bab26c926724f3c508681c7dae1
2010-08-08 17:45:07 -07:00
Xavier Ducrohet
80e62ac61c Fix the layoutlib Paint.set(Paint) method. Do not merge.
It would change the text rendering info but not recompute
the Java Font objects. The effect is a broken font rendering
in the EditText (which use this method to copy some Paint
object before using the copy for the actual drawing)

Change-Id: I9e7fbf9bd57b421fd793876a6de4ade1ecac372d
2010-07-19 10:19:49 -07:00
The Android Open Source Project
b5b37f3bcc am 3d02b48b: merge from open-source master
Merge commit '3d02b48bd95293c767563729264f007dbcff82b3'

* commit '3d02b48bd95293c767563729264f007dbcff82b3':
  Fix the layoutlib Paint.set(Paint) method.
2010-07-19 09:11:17 -07:00
The Android Open Source Project
3d02b48bd9 merge from open-source master
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
2010-07-19 09:04:02 -07:00
Xavier Ducrohet
b8bb8ac5bb Fix the layoutlib Paint.set(Paint) method.
It would change the text rendering info but not recompute
the Java Font objects. The effect is a broken font rendering
in the EditText (which use this method to copy some Paint
object before using the copy for the actual drawing)

Change-Id: I6d8d1bf86f0d77d088f60ad81c71dd3ebab727b0
2010-07-16 16:46:39 -07:00
Joe Onorato
dcd077179c am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into gingerbread
Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07'

* commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07':
  Clean up some style in the makefiles.
2010-07-15 11:54:00 -07:00
Joe Onorato
80a60ba85b Clean up some style in the makefiles.
Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
2010-07-14 19:58:30 -07:00
Steve Block
f1ff21ac62 Fixes a few minor problems with AAPT
- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards

This is a first step toward being able to generate APKs on the fly on the device.

Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85
2010-06-25 11:02:15 +01:00
Dan Morrill
a1b6dba25f am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:45:53 -07:00
Dan Morrill
45378f07b8 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:36:17 -07:00
Dan Morrill
56a5ee3325 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:23:03 -07:00
Dan Morrill
6b22d81aa3 As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.

Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
2010-06-15 21:57:33 -07:00
Joe Onorato
6b56a84ace am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'

* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:49:05 -07:00
Joe Onorato
9a5fcd1c14 am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 15:21:14 -07:00
Joe Onorato
d6e3b20428 am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
2010-06-15 14:24:51 -07:00
Jeff Brown
8e03b7566c resolved conflicts for merge of 9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
2010-06-13 19:16:55 -07:00
Jeff Brown
46b9ac0ae2 Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now.  To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.

Includes part of the new input event NDK API.  Some details TBD.

To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument.  The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points.  The ViewRoot then
provides the InputChannel to the InputQueue.  Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue.  This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.

There can be zero or more targets for any given input event.  Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets).  Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.

End-to-end event dispatch mostly works!

To do: event injection, rate limiting, ANRs, testing, optimization, etc.

Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
2010-06-13 17:42:16 -07:00
Joe Onorato
74905e5b0a The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
2010-06-10 18:36:57 -07:00
Dianne Hackborn
8443e93fa2 am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo 2010-06-06 12:13:59 -07:00
Dianne Hackborn
168585ed68 am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
2010-06-06 12:10:05 -07:00
Dianne Hackborn
3cbef2cc21 am 5474902f: Merge "xhdpi" into froyo
Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi
2010-06-04 16:33:48 -07:00
Dianne Hackborn
588feee5e7 xhdpi
This is only a tool (aapt) change, and does not impact any current code.

Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
2010-06-04 14:36:39 -07:00
Vasu Nori
74f170f946 new API in Context. on openDatabase, new param DatabaseErrorHandler
add new method openOrCreateDatabase in Context.java to allow
callers specify a DatabaseErrorHandler object to be used when
database corruption occurs.
add new constructor in SQLiteOpenHelper to accept DatabaseErrorHandler
as an additional param to be used when SQLiteDatabase instance is
created.

Change-Id: I912a0202a74510f9ca0206dd8101c4abab9102ae
2010-06-03 12:38:11 -07:00
Kenny Root
453bcedeaa am 5095232d: am 15fe2cb7: Add error checking for translatable strings 2010-06-03 09:37:14 -07:00
Kenny Root
15fe2cb73b Add error checking for translatable strings
Translatable strings that have multiple substitutions should use
positional String.format() substitutions. This change makes it an error
not to use that format on translatable strings that have more than one
substitution in its text.

Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
2010-06-03 09:33:43 -07:00
The Android Open Source Project
a7b01969f6 am cee6300c: am 38a410f1: am 686d9ff5: merge from open-source master 2010-05-10 12:56:46 -07:00
The Android Open Source Project
38a410f12a am 686d9ff5: merge from open-source master
Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken

* commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51':
  Use isLocationProviderEnabled to test for enabled providers
  Added WEB_URL_PATTERN for Montenegro ".me"
  long modifier was on the wrong argument.
2010-05-10 12:53:28 -07:00
The Android Open Source Project
686d9ff53c merge from open-source master
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
2010-05-10 12:37:10 -07:00
Jean-Baptiste Queru
0a26aaad8b Merge "long modifier was on the wrong argument." 2010-05-10 08:55:17 -07:00
Dan Morrill
da3ae8c193 am 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo 2010-05-04 17:46:13 -07:00
Dan Morrill
6a22fb9bef am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:45:49 -07:00
Dan Morrill
89d97c1418 Adding the backward-compatible filtering heuristics for the new device
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
2010-05-04 08:39:03 -07:00