Commit Graph

713 Commits

Author SHA1 Message Date
The Android Open Source Project
bf4564f03d am 5adfe6c5: merge from open-source master
Merge commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f'

* commit '5adfe6c56369b48e10493c0bb9e9b64ac553a19f':
  Fix the problem that color drawable cache key conflicts another drawable one.
2010-07-16 14:06:06 -07:00
The Android Open Source Project
5adfe6c563 merge from open-source master
Change-Id: Iacd42b06fa01fa6dfd18b81f07ce4b6da922dfff
2010-07-16 14:01:37 -07:00
Kenny Root
fb4e1e24a9 resolved conflicts for merge of 181bb0ab to master
Change-Id: I2284e7c671d127da0d124fbabae8d887727fd5bf
2010-07-16 09:04:09 -07:00
Christopher Tate
6ba776ad34 am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" into gingerbread
Merge commit '078ccbdbb98c118aa87cab2fef61ff90dd128358'

* commit '078ccbdbb98c118aa87cab2fef61ff90dd128358':
  Add native C APIs for working with the Asset Manager
2010-07-15 23:05:27 -07:00
Kenny Root
02c8730c1b Add API to call to vold for mounting OBBs
* Unhide StorageService class; hide all the USB-related items

* Add application-visible API to StorageManager for OBB files

* Add class for parceling OBB info across binders (ObbInfo)

* Add a JNI glue class to libutils/ObbFile (ObbScanner)

* Add API to MountService to deal with calling into vold and checking
  permissions

Change-Id: I33ecf9606b8ff535f3a2ada83931da6bbef41cfd
2010-07-15 21:31:58 -07:00
Dmitri Plotnikov
4565d52bdd Fixing NPE in CursorLoader
Change-Id: I8d005473166f43dd018ac304ff9ec606e90483a3
2010-07-15 18:24:07 -07:00
Masanori Ogino
c7d9d2790f Fix the problem that color drawable cache key conflicts another drawable one.
The cache key of a color drawable resource may be the same as another
drawable resource's value.

Change-Id: Ia971bb242ceac5e8f9346094009a10f356399ab9
(Reduced duplicated codes and replace TAB to white spaces)

And try to fix compile error.
2010-07-16 09:37:34 +09:00
Christopher Tate
6cce32b6ad Add native C APIs for working with the Asset Manager
Change-Id: I493b142c4b35e5cc1a1e85283bb5dfb306a6d261
2010-07-15 14:28:21 -07:00
Steve Howard
4c14a0f13f am 47b46648: am b8d890eb: Merge "Initial implementation of the download manager public API." into gingerbread
Merge commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1'

* commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1':
  Initial implementation of the download manager public API.
2010-07-13 13:05:43 -07:00
Steve Howard
a270936066 Initial implementation of the download manager public API.
The implementation is in android.net.DownloadManager, which is
obtained through Context.getSystemService().  Right now this class
acts as a simple wrapper on top of the existing DownloadProvider,
exposing a simple interface to a subset of DownloadProvider's
functionality.  There are several TODOs for features that require
changes to the underlying download manager implementation.

Change-Id: I2f26e51b60b6e82af8478ac7ccd895667df095b6
2010-07-13 11:12:16 -07:00
Kenny Root
511d9ec363 am 0a21801f: am a5402dab: Merge "OBB API for PackageManager" into gingerbread
Merge commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b'

* commit '0a21801f5fae22cd5e1b3e9f1c1405c744e24c9b':
  OBB API for PackageManager
2010-07-08 19:09:06 -07:00
Kenny Root
93565c4b32 OBB API for PackageManager
Simple API for tracking .obb files associated with packages. Stores the
path in the PackageSettings. No verification of file content is done
now since the PackageManagerService can't read the SD card where these
files will likely live.

Change-Id: Ibeaf26ba0526b6d60f401137e58f46ee9faff39e
2010-07-07 09:57:51 -07:00
Elliott Hughes
1ad636c315 Defer to ICU's knowledge of language-specific grammatical quantity rules.
Also improve the documentation to make it a little less unclear what this
is all about. In particular, explain why the original submitter's complaint
about "zero" never being used in English, is expected behavior.

Bug: 2663392
Change-Id: Iade3b4f5c549ce01a95fd0e7e5c6ea394178eda3
2010-07-01 16:51:48 -07:00
Chih-Chung Chang
1df11fc8f1 am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.
Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'

* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
  Unhide new API for supporting multiple cameras.
2010-06-27 20:54:36 -07:00
Chih-Chung Chang
de1057c4a6 Unhide new API for supporting multiple cameras.
Change-Id: I916a536c80330444a15986ba380205a6deed2390
2010-06-28 11:12:45 +08:00
Dianne Hackborn
36e5f667bc resolved conflicts for merge of 2eb12a47 to master
Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99
2010-06-24 16:29:54 -07:00
Dianne Hackborn
01e4cfc47d Some ActivityThread/ActivityManager cleanup.
- Move PackageInfo out of ActivityThread, renaming to LoadedApk.
- Rename some of the other PacakgeInfo inner classes to better
  represent what they are.
- Rename HistoryRecord to ActivityRecord.
- Introduce AppGlobals, to eventually let ActivityThread become
  package scoped.

Change-Id: Ib714c54ceb3cdbb525dce3db9505f31042e88cf0
2010-06-24 15:20:48 -07:00
Gilles Debunne
03f0292744 New XmlDocumentProvider class.
Minor changes in the Adapters.java helper class.

Extracts data out of a XML document using an XPath-like syntax.

Change-Id: I0617b0783f11c86118b42cd8485d54440810c805
2010-06-23 10:43:00 -07:00
Daniel Sandler
c4c6635d1a am 57b53265: am ef730e6e: Merge "Fix javadocs." into gingerbread
Merge commit '57b5326561b6edb22b09016985b41b7cdb2156c0'

* commit '57b5326561b6edb22b09016985b41b7cdb2156c0':
  Fix javadocs.
2010-06-23 10:32:02 -07:00
Daniel Sandler
6c55b8b143 am 71764c4c: am 613dde4a: Revised "immersive mode" API.
Merge commit '71764c4ce5b248a79542238b171a783e82e0fe37'

* commit '71764c4ce5b248a79542238b171a783e82e0fe37':
  Revised "immersive mode" API.
2010-06-23 10:31:21 -07:00
Daniel Sandler
8091ca5015 Fix javadocs.
Change-Id: Ic37c16625ddd0175cc048dd2b22bc75c6962d43d
2010-06-22 13:58:46 -04:00
Daniel Sandler
613dde4aa6 Revised "immersive mode" API.
No longer a window bit, FLAG_IMMERSIVE is now set on
ActivityInfo.flags and in the Activity's manifest as
android:immersive="true" (ActivityInfo).

[An "immersive" activity is one that wishes to avoid being
paused by full-screen notifications (like an incoming call).
An activity that sets FLAG_IMMERSIVE/android:immersive is
sending a signal to the notification manager, status bar,
etc. that they should try to find some other way to get the
user's attention in high-priority situations.]

[Originally: change Ie290c2e.]

Change-Id: I967bb10b930b8f0772b10f81f2957a03fa3f1736
2010-06-22 12:30:12 -04:00
Dmitri Plotnikov
bef9c7a59d Preventing cursor leaks when a query is interrupted
Re-ran runtest cts-os

Change-Id: I518a2a4f842b01d082078e16643aa377a4575237
2010-06-16 15:38:07 -07:00
Dianne Hackborn
d0b15cecc6 resolved conflicts for merge of f3307ae8 to master
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
2010-06-04 14:09:02 -07:00
Dianne Hackborn
860755faa6 Add support for heavy-weight applications.
Only one can be running at a time, their process can not be killed,
and a notification is posted while it is running.

Change-Id: I843015723947e0c934ae63a1aeee139327c0bc01
2010-06-04 10:09:13 -07:00
Vasu Nori
03acd51bae fix docs errors
Change-Id: I775dc3e665a8ce32ed6c95f3240280ddef984bb6
2010-06-03 14:44: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
Romain Guy
812ccbeb3c Add new hardwareAccelerated manifest attribute to enable HW drawing.
Change-Id: I2bb0252f3699cb720e7f5b6868419c9904e4fb35
2010-06-02 10:41:59 -07:00
The Android Open Source Project
a2f2a34d51 am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master 2010-05-19 09:45:51 -07:00
The Android Open Source Project
b32a74c73b am ee1cdd0e: merge from open-source master
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken

* commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed':
  Don't allow invalid Uris to be added as observers.
2010-05-19 09:43:20 -07:00
The Android Open Source Project
ee1cdd0e60 merge from open-source master
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
2010-05-19 09:36:55 -07:00
Anthony Newnam
f51266471c Don't allow invalid Uris to be added as observers.
If a null segment is added, it will cause problems traversing the list
at a later point.

Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
2010-05-19 07:39:07 -05:00
Jeff Hamilton
7860b10d16 Another try at fixing the docs build.
Change-Id: Ief60f4e71efee1d3bb4ee36e2f2a2fcaeb996284
2010-05-18 11:11:57 -05:00
Jeff Hamilton
e6c6d09a7e Fix a broken docs link.
Change-Id: I2e940165726ecfce306cd143ed049045c927b6a0
2010-05-18 10:34:47 -05:00
Jeff Hamilton
9911b7f83d Add the Loader and supporting classes.
Loaders are designed to make it easier to manage
asynchronously loading data.

Change-Id: I948db08c721411e94fca071dc6fb4db2b83ea4d6
2010-05-18 00:07:15 -05:00
Costin Manolache
2b6b835196 am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:12:53 -07:00
Costin Manolache
c195965893 am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken

* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
  Bug 2680071: Rename the Cloud to Device
2010-05-12 19:10:01 -07:00
Costin Manolache
8d83f9e31b Bug 2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Costin Manolache
3a17fbb757 am b20842c7: am 8579a4d7: am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-12 09:24:20 -07:00
Costin Manolache
8579a4d726 am 625de488: am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo
Merge commit '625de488973f262e56d3ee6825a8cf1ebaee089b' into kraken

* commit '625de488973f262e56d3ee6825a8cf1ebaee089b':
  Bug 2673557: rename datamessaging
2010-05-12 07:55:32 -07:00
Costin Manolache
161c75a0f3 Bug 2673557: rename datamessaging
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
2010-05-10 19:12:49 -07:00
Dianne Hackborn
09d91ca47c am fefe7a22: Merge "Fix build." into kraken 2010-04-29 18:01:33 -07:00
Dianne Hackborn
22ec9ab3b8 Fix build.
Change-Id: Iac00a1d02d04c346807ff2580362adfc838d1813
2010-04-29 17:56:03 -07:00
Dianne Hackborn
8640c1d0e5 am 14cee9f6: New xlarge screen size. 2010-04-28 16:58:05 -07:00
Dianne Hackborn
14cee9f688 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
2010-04-28 16:51:52 -07:00
Vasu Nori
ca3a7b9bc5 am 43f2c35b: am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 2010-04-28 15:50:49 -07:00
Vasu Nori
43f2c35bf3 am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken

* commit '91a62f3d4a6b4f92c694d09e991fc6f82701fc47':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
2010-04-28 15:42:23 -07:00
Vasu Nori
020e534579 bug:2622719 move 'forcing of cursor execution' to ContentProvider
revert part of the CL: Ia561135e974a44ad3e3774ecb23c6a3d0fc38176
and add it to ContentProvider.query() to force query execution
in worker thread, instead of having the main thread incur the cost
of query execution and potentially get ANR

Change-Id: I0ea8a170bd954a421f4ad825f8090319a83a5b2b
2010-04-28 15:32:54 -07:00
Fred Quintana
2e192931d5 am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 2010-04-28 14:25:19 -07:00
Fred Quintana
2bf0f1a3c1 am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken

* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
  revert a change in the SyncManager that caused it to not cancel
2010-04-28 14:18:19 -07:00