Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,949 Commits 3 Branches 0 Tags
1a4ebd42e2abbce86fcbdb0b68b2229892a4e8a5
Commit Graph

690 Commits

Author SHA1 Message Date
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
Fred Quintana
9aaf24f2a4 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:10:05 -07:00
Fred Quintana
f910cf4dcb am 018579c4: am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 2010-04-27 18:56:12 -07:00
Fred Quintana
12664a7a4d 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.

Change-Id: I0c18ce3b7098e79e2080e401e441ad246b1d6910
http://b/2631221
 2010-04-27 16:33:19 -07:00
Dianne Hackborn
525bb6a0cd am b6c45927: am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 2010-04-27 12:27:36 -07:00
Fred Quintana
018579c473 am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 
Merge commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08' into kraken

* commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08':
  Add JavaDoc for SyncResult
 2010-04-27 12:02:32 -07:00
Fred Quintana
6ce78924eb Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 2010-04-27 11:56:16 -07:00
Fred Quintana
20c640e0f4 Add JavaDoc for SyncResult 
http://b/2420252

Change-Id: I88be5232d54959f6ec3480c36751a8fb7dc369fd
 2010-04-27 11:21:53 -07:00
Dianne Hackborn
ff121670b7 am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken 2010-04-27 11:20:31 -07:00
Dianne Hackborn
b6c459276f am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 
Merge commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken

* commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-27 11:18:24 -07:00
Dianne Hackborn
34483a0f6e resolved conflicts for merge of 5a8f877c to kraken 
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
 2010-04-27 11:06:43 -07:00
Dianne Hackborn
94c567e1e3 Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE 
There was a gap in the bit numbers.

Change-Id: I0feef7dc4abed5db7412659b5ad078caffe4f2d4
 2010-04-26 18:50:11 -07:00
Dianne Hackborn
3202d38022 Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE 
Also update 8.xml to match the current API.

Change-Id: I668fe56f6c156c2e8daa458baa7410fdb8ebef52
 2010-04-26 17:51:34 -07:00
Adam Powell
b9eab6c793 resolved conflicts for merge of 81cd2e90 to master 
Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71
 2010-04-23 16:49:54 -07:00
Adam Powell
81cd2e90cc Logo attribute for manifest and PackageManager methods to fetch it 
Change-Id: I2c5ac44a4e2af982a616b2012901d7395013b19f
 2010-04-23 15:49:07 -07:00
Suchi Amalapurapu
ef404b7aa0 am 0c64ff75: am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 2010-04-20 15:22:15 -07:00
Suchi Amalapurapu
0c64ff7568 am d32f9422: am 0dde41fb: Merge "Fix 2610961 Unhide broadcast intents that are sent when sdcard gets mounted/unmounted." into froyo 
Merge commit 'd32f942280cc4390ab853321557eef06292b300e' into kraken

* commit 'd32f942280cc4390ab853321557eef06292b300e':
  Fix 2610961
 2010-04-20 15:14:41 -07:00
Suchi Amalapurapu
89e0c1a9f5 Fix 2610961 
Unhide broadcast intents that are sent when sdcard gets mounted/unmounted.

Change-Id: Ibb5700178e98f657f1c2b6a2f83e722151c4a44f
 2010-04-20 14:08:08 -07:00
Adam Powell
212db7d3f8 Added MultiSelectListPreference 
Added set support to XmlUtils; added Set<String> functions to SharedPreferences.

MultiSelectListPreference allows multiple selection and persistence of
string preferences. Addresses bug 2575634.

Change-Id: Icd56022d444b0ce43cccf819cd7d600fdb00e88a
 2010-04-15 10:18:17 -07:00
Dan Egnor
7829f3d4b1 am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:28:29 -07:00
Dan Egnor
a28a05f31b am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken

* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
  Missed these ones in the previous rename.
 2010-04-08 14:19:52 -07:00
Brad Fitzpatrick
3f73e4869f am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo 2010-04-08 14:14:46 -07:00
Dan Egnor
2124808060 Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:10:50 -07:00
Brad Fitzpatrick
9c3554e997 am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo 
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken

* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
  Rename logtag for clarity.
 2010-04-08 14:08:56 -07:00