Commit Graph

485 Commits

Author SHA1 Message Date
Paul Westbrook
44641d3db3 Bug 2321983
Move SYNC_DETAILS from framework/base to the gsf clientlib
2010-01-11 14:00:35 -08:00
Romain Guy
980a938c1c Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
2010-01-08 15:11:38 -08:00
Tom O'Neill
046dd0111c Merge "ContentResolver.query() includes performance considerations" 2010-01-08 13:04:56 -08:00
Tom O'Neill
0ba1cb06c6 ContentResolver.query() includes performance considerations
Mention the desirability of using "?"-substitution in the where clause,
and reemphasize the importance of using an explicit projection.

Change-Id: Iaa489d50db409f34e78bcd55253e5a4e53445cf2
2010-01-08 12:53:50 -08:00
Doug Zongker
edc5189c33 change remaining frameworks/base Gservices to Secure settings
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
2010-01-07 15:00:37 -08:00
Romain Guy
4cb8b8ffdf Merge "Fix typo in ColorStateList documentation." 2010-01-04 14:46:28 -08:00
Romain Guy
79dc8ccddd Fix typo in ColorStateList documentation. 2010-01-04 14:45:49 -08:00
Dan Egnor
1337b012f8 Fix DropBox reference in SDK comment. (Fix SDK build.) 2010-01-04 11:02:00 -08:00
Dan Egnor
e38d58bf89 Remove Google-specific (or only-used-by-Google-code) classes.
Fix a small typo in Context javadoc.
2010-01-04 10:14:21 -08:00
Tom Taylor
f0108cda21 resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
2009-12-22 10:11:55 -08:00
Dianne Hackborn
ee0511d76c Fix issue #1154972: clone defined, but class doesn't implement Cloneable 2009-12-21 18:08:13 -08:00
Tom Taylor
d4a4729c0c Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
2009-12-21 13:59:18 -08:00
Xavier Ducrohet
009909b417 am b43b35a0: am e6547423: Merge change I10073d50 into eclair
Merge commit 'b43b35a034ad667ba749270537155e7534906153'

* commit 'b43b35a034ad667ba749270537155e7534906153':
  Add Annotation for optional features.
2009-12-16 12:19:52 -08:00
Xavier Ducrohet
b43b35a034 am e6547423: Merge change I10073d50 into eclair
Merge commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3' into eclair-plus-aosp

* commit 'e6547423e3ed7d84f0d7fee8199e5bbb015fd8c3':
  Add Annotation for optional features.
2009-12-16 12:16:24 -08:00
Fred Quintana
2c5634198a resolved conflicts for merge of 5a374f94 to master 2009-12-15 15:57:33 -08:00
Xavier Ducrohet
3274b9b7da Add Annotation for optional features.
This is used by the SDK to display available features in the
editors.

Change-Id: I10073d503d1b3dcb92a5dc526cd054285b85fa3a
2009-12-14 17:52:20 -08:00
Fred Quintana
274dc9d35f moved the hidden sync helpers out of the framework 2009-12-14 16:33:13 -08:00
Dianne Hackborn
74a76d5e07 am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:15:03 -08:00
Dianne Hackborn
1c633fc89b Implement API to have new broadcasts replace existing broadcasts.
Use this in various places where it should serve no purpose to deliver
both broadcasts.  This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
2009-12-14 15:03:35 -08:00
Fred Quintana
34bb115367 am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java
Merge commit 'c7afd9221babd89ca4acd859c608f41c29f3731b'

* commit 'c7afd9221babd89ca4acd859c608f41c29f3731b':
  - move the EventLog stuff out of ATSA
2009-12-10 14:42:07 -08:00
Doug Zongker
36b1907693 am fc96523b: am b3c1f1cf: Merge change I7daa7ae8 into eclair-mr2
Merge commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c'

* commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c':
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 14:41:31 -08:00
Bjorn Bringert
e11a001119 am c0c7b32e: am 45e77ce3: Merge change I154386b1 into eclair-mr2
Merge commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167'

* commit 'c0c7b32e0b5ab6af749db638a7f08d8a3767d167':
  Use unbundled QSB for global search
2009-12-10 14:39:57 -08:00
Fred Quintana
97ef7637c6 - move the EventLog stuff out of ATSA
- move the google calendar sync adapter settings out of Settings.java
2009-12-10 11:16:18 -08:00
Fred Quintana
2ec6c56991 am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp

* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
  - removed the concept of Entity from the ContentProvider APIs
2009-12-10 10:37:52 -08:00
Android (Google) Code Review
b3c1f1cff4 Merge change I7daa7ae8 into eclair-mr2
* changes:
  move event log tags used by SyncAdapter into a local .logtags file
2009-12-10 10:17:17 -08:00
Dianne Hackborn
9b902a5266 am eb68a226: am af9788a9: Merge change Ia53c6725 into eclair-mr2
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'

* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
  Add bindService API to not bring ot foreground.
2009-12-10 07:55:00 -08:00
Ken Shirriff
630432e424 am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2
Merge commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf'

* commit 'd44c2f2c85c8720763837b89a8988b6e5cc248bf':
  Migration to TrafficStats.
2009-12-10 07:06:25 -08:00
Trevor Johns
936b1ba33d am 15650af4: am 7e42e8f3: am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'

* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
  Updating list of standard Intents in android.content.Intent
2009-12-10 07:01:37 -08:00
Fred Quintana
f7ae3c958b am 517ebaa6: am 18ff0e32: am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '517ebaa69a9c4baed99bb5667b956dab129c96e7'

* commit '517ebaa69a9c4baed99bb5667b956dab129c96e7':
  remove an old STOPSHIP comment
2009-12-10 06:59:55 -08:00
Android (Google) Code Review
45e77ce36a Merge change I154386b1 into eclair-mr2
* changes:
  Use unbundled QSB for global search
2009-12-09 23:32:31 -08:00
Doug Zongker
45e6dbf90b move event log tags used by SyncAdapter into a local .logtags file 2009-12-09 13:30:07 -08:00
Fred Quintana
328c0e7986 - removed the concept of Entity from the ContentProvider APIs
- removed the parcelling ability from Entity and EntityIterator and made them public
- added an EntityIterator abstract implementation that allow easy wrapping of a Cursor
- changed the VCard code to use the new APIs
2009-12-09 10:30:18 -08:00
Bjorn Bringert
3c50ef6f66 Use unbundled QSB for global search
This obsoletes the following:
- The need to run SearchDialog in the system process.
- The global search mode code in SearchDialog.
- The GlobalSearch package.
- The search widget built into Launcher.

I will remove these in future changes.

Change-Id: I154386b1d6be73cfeab8376b6959a1dc5483e5f0
2009-12-09 14:51:19 +00:00
Dianne Hackborn
09c916bccb Add bindService API to not bring ot foreground.
Add a new flag for bindService that tells the system to not bring the
target service's process in to the foreground scheduling class.  This is
used by the sync system to not cause the current sync adapter to come to
the foreground as it is running.

Also some small improvements to the debug output of the process list
of oom adj and scheduling info.
2009-12-08 16:33:59 -08:00
Ken Shirriff
1719a39a4c Migration to TrafficStats.
TrafficStats is the SDK version of NetStat.
2009-12-08 11:14:03 -08:00
Trevor Johns
cd337edc85 am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-plus-aosp

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent
2009-12-07 22:43:09 -08:00
Trevor Johns
7e42e8f334 am d59fb6e7: Updating list of standard Intents in android.content.Intent documentation.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2

* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
  Updating list of standard Intents in android.content.Intent
2009-12-07 22:42:46 -08:00
Trevor Johns
d59fb6e743 Updating list of standard Intents in android.content.Intent
documentation.
2009-12-07 22:38:49 -08:00
Fred Quintana
c1dc8e4e24 am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-plus-aosp

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:43 -08:00
Fred Quintana
18ff0e329b am 1067c3cb: Merge change Ia5ef9acd into eclair
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2

* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
  remove an old STOPSHIP comment
2009-12-07 17:04:40 -08:00
Android (Google) Code Review
1067c3cbab Merge change Ia5ef9acd into eclair
* changes:
  remove an old STOPSHIP comment
2009-12-07 16:59:46 -08:00
Fred Quintana
a5ef9acdf4 remove an old STOPSHIP comment 2009-12-07 14:23:33 -08:00
Daisuke Miyakawa
9946639f74 am 8ad6ec2e: am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4'

* commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4':
  Implement new MockContentProvider. Also make ContentProvider aware of the class.
2009-12-04 04:33:05 -08:00
Fred Quintana
5ff9239f4f am a8dd0a54: am 298de218: am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6'

* commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-04 04:31:52 -08:00
Daisuke Miyakawa
8280c2b15f Implement new MockContentProvider. Also make ContentProvider aware of the class.
Rename the old MockContentProvider to MockIContentProvider since it is
more appropriate name.

Detail:
Current developers inevitably depend on the backend used by ContentProvider,
which is useful but not ideal nor "testable" from the view of them.

Current MockContentResolver only accepts exact "ContentProvider" class, not
IContentProvider interface, since we want to hide "IContentProvider" while
the old MockContentProvider implements IContentProvider and as a result some
methods we want to hide may be exposed to the public SDK now and probably
for the future.

On the other hand, ContentProvider is not interface but an exact class
heavily depends on the internal logic and not suitable for external
developers to use for tests.

The new MockContentProvider introduces the mock implementation
for ContentProvider.
It extends ContentProvider, so "is" ContentProvider, but tries to avoid
depending on any backend System like IPC in Android, etc.
This should be useful from the view of application developers who do not
want to be confused with ContentProvider/ContentResolver backend
implementation "at all" and want to use MockContentResolver without
any other ContentProvider implementations tightly connected to the
external worlds.
2009-12-04 17:48:44 +09:00
Fred Quintana
ac1cd3181a am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-plus-aosp

* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:17:46 -08:00
Fred Quintana
298de218c5 am 0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2

* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:17:00 -08:00
Android (Google) Code Review
0ce8431c15 Merge change Iaa7edda4 into eclair
* changes:
  don't reschedule syncs that failed with a tooManyRetries error
2009-12-03 17:10:59 -08:00
Fred Quintana
aa7edda471 don't reschedule syncs that failed with a tooManyRetries error 2009-12-03 14:18:58 -08:00
Joe Onorato
8da7873f94 am dbed5350: am b28632a5: am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.
Merge commit 'dbed53504f515337ccc2f60248bb589dff0f24fb'

* commit 'dbed53504f515337ccc2f60248bb589dff0f24fb':
  Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
2009-12-03 10:51:34 -08:00