Commit Graph

10410 Commits

Author SHA1 Message Date
Steve Howard
9db328463a am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'

* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
  Interface support for custom HTTP headers in DL manager
2010-07-15 12:31:29 -07:00
Steve Howard
203ec9fa6e am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
2010-07-15 12:28:39 -07:00
Steve Howard
d6343c26b8 Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 2010-07-15 12:24:14 -07:00
Scott Main
82e2b4cb51 am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'

* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
  docs: lots of additions to the resources docs
2010-07-15 11:54:15 -07:00
Fred Quintana
743dfad2a5 fix a bug where some accounts changed listeners don't see the new
version of the accounts because the accounts changed broadcast is
sent from within the transaction try block, thus before db.endTransaction()
is called.

bug: 2839034
Change-Id: I814c7de9998ba52b85256dd2f3f19104fba3049c
2010-07-15 11:41:20 -07:00
Scott Main
4fd416880e am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp

* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
  docs: lots of additions to the resources docs
2010-07-15 11:23:08 -07:00
Scott Main
5352d2378d am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs
2010-07-15 11:20:32 -07:00
Scott Main
38137d7a27 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
Romain Guy
3fb33c7262 Merge "Added method getPreferredHttpHost" 2010-07-15 10:49:47 -07:00
Chet Haase
c3aa361d65 Add various properties to View to allow it to be moved, scaled, faded, and rotated by property manipulation instead of just Animation operations.
Change-Id: Iefab11f243c7511f7bba0e32bd399ed716b9131f
2010-07-15 10:45:43 -07:00
Fabrice Di Meglio
25fd875da6 Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)" 2010-07-15 10:23:31 -07:00
Steve Howard
ea9147df00 Interface support for custom HTTP headers in DL manager
* constants for new DB table, keys for including headers in a
  DownloadProvider.insert() call, and new URIs for retrieving headers
* support in DownloadManager to pass headers to the provider
2010-07-15 10:22:50 -07:00
Romain Guy
9e7f41e85f Merge "Allow ListPreference summary to use entry" 2010-07-15 09:40:34 -07:00
Romain Guy
c9c987d7e1 Merge "Make HTTP Header class handle multiple cache-control fields." 2010-07-15 09:39:42 -07:00
Mike Lockwood
c1aea2f38c Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions" 2010-07-15 08:38:18 -07:00
Andrew Stadler
5ba2e74560 am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114'

* commit '521e9aa7523220c3dc48f6abd32fad6b76eea114':
  Skip hostname verification when using insecure factory
2010-07-14 23:16:25 -07:00
Andrew Stadler
521e9aa752 am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp

* commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9':
  Skip hostname verification when using insecure factory
2010-07-14 22:39:19 -07:00
Andrew Stadler
c98e431119 am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread

* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
  Skip hostname verification when using insecure factory
2010-07-14 22:33:42 -07:00
Jim Miller
839458d8d4 resolved conflicts for merge of e03952c0 to master
Change-Id: I414d934101d452a2c2500e539f0b0aff1e1b3ff0
2010-07-14 17:21:00 -07:00
Dianne Hackborn
71ecab2d89 Argh oops I didn't mean to delete this.
Change-Id: I8910eb8b6e898b77ee6fc63420d6954b496513ca
2010-07-14 17:09:47 -07:00
Dianne Hackborn
0a48a1f31d am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbread
Merge commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0' into gingerbread-plus-aosp

* commit 'ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0':
  Argh oops I didn't mean to delete this.
2010-07-14 17:04:58 -07:00
Dianne Hackborn
ed86eaa730 Merge "Argh oops I didn't mean to delete this." into gingerbread 2010-07-14 17:02:49 -07:00
Jim Miller
e03952c042 am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread
Merge commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2' into gingerbread-plus-aosp

* commit '9d42c7f75cfd7544d6e3f253cedf9ac983fdc6b2':
  Fix 2797185: Re-enable thumbnail generation in framework
2010-07-14 17:02:36 -07:00
Jim Miller
9d42c7f75c Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerbread 2010-07-14 16:59:52 -07:00
Dianne Hackborn
251fd430c7 Argh oops I didn't mean to delete this.
Change-Id: I3d0877d56f1abab3d0929a086621f4ef1212cecc
2010-07-14 16:56:31 -07:00
Mike Lockwood
9d9c1be296 SQLiteDatabase: Add mechanism for registering custom sqlite3 functions
This allows you to define a callback in Java that can be called from
sqlite3 database triggers.

Change-Id: I09fdbd38c9807b6b0dd19c2761b01e8db76f1adc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-14 19:52:33 -04:00
Adam Powell
0d60b96a8f Merge "Bug 2841148 - Add accessors for action bar context mode state." 2010-07-14 16:39:04 -07:00
Adam Powell
29ed7575c2 Bug 2841148 - Add accessors for action bar context mode state.
Change-Id: I04f3efce5a692b346756cc80c8d15f3abba10558
2010-07-14 16:26:28 -07:00
The Android Open Source Project
a51eb0bb2f am 50576fa8: merge from open-source master
Merge commit '50576fa8152557a25e1a231c66d694fffbab34d6'

* commit '50576fa8152557a25e1a231c66d694fffbab34d6':
  Start app with several activities with intent filter [Main, Launcher] was broken
2010-07-14 16:14:06 -07:00
The Android Open Source Project
50576fa815 merge from open-source master
Change-Id: I20cf00dba6908eeee12645e6878db7becdc2a5f9
2010-07-14 16:11:13 -07:00
Adam Powell
1f5dddc85c Merge "Fix bug 2835056 - ActionBar doesn't update title properly when set in onCreate" 2010-07-14 14:51:12 -07:00
Adam Powell
e92ea3474d Fix bug 2835056 - ActionBar doesn't update title properly when set in onCreate
Change-Id: I593315db8df0190c2702a87ebef293e5f798823d
2010-07-14 14:46:37 -07:00
Adam Powell
92db56f78c Merge "Fix bug 2838426 - timing issue with starting/finishing action bar context modes" 2010-07-14 14:25:48 -07:00
Dianne Hackborn
72c9265ac5 Merge "Fix fragment index expunging." 2010-07-14 12:17:24 -07:00
Dianne Hackborn
9e14e9f33a Fix fragment index expunging.
Change-Id: If37e58dfa998575530305584d3aa756bb5a61d7b
2010-07-14 12:14:24 -07:00
Adam Powell
3461b32a1c Fix bug 2838426 - timing issue with starting/finishing action bar context modes
Change-Id: Ie29b0bea96be02675a2104f07c912700c2823abc
2010-07-14 11:35:47 -07:00
Steve Howard
756088482f am 57de95a5: am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'

* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
  Download manager support for file URIs + last modified time
2010-07-14 11:25:32 -07:00
Steve Howard
57de95a51f am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
2010-07-14 11:22:20 -07:00
Steve Howard
05940b2c04 Merge "Download manager support for file URIs + last modified time" into gingerbread 2010-07-14 11:19:38 -07:00
Romain Guy
d0d5c072aa Merge "Prevent crash in ListView when changing cache hint." 2010-07-14 11:08:38 -07:00
Romain Guy
266e05179c Prevent crash in ListView when changing cache hint. 2010-07-14 11:08:02 -07:00
Robert Greenwalt
26dd7b3bb3 Merge "Pass network properties to ConnectivityService." 2010-07-14 09:09:31 -07:00
Andy McFadden
3aa513c0ee Merge "Implement native dump for "am dumpheap -n"." 2010-07-14 07:45:09 -07:00
Andreas Sandblad
2986f858ae Added method getPreferredHttpHost
Added method for returning preferred proxy which takes both
localhost and Wi-Fi into account. This is a convenient method
to clients which only wants to set a correct proxy and don't
want to build in dependency to if Wi-Fi is active or not.
Currently no Wi-Fi proxy is supported by the system, but once
added, this method could return a suitable proxy for Wi-Fi.

Change-Id: I8c9c2879351fd25a20ea82a2cb000f226248c357
2010-07-14 08:49:46 +02:00
Henrik Baard
c692e8c4da Make HTTP Header class handle multiple cache-control fields.
The HTTP specification states the following about the fields:
Multiple message-header fields with the same field-name MAY be present
in a message if and only if the entire field-value for that header field
is defined as a comma-separated list [i.e., #(values)]. It MUST be
possible to combine the multiple header fields into one "field-name:
field-value" pair, without changing the semantics of the message, by
appending each subsequent field-value to the first, each separated by a
comma. The order in which header fields with the same field-name are
received is therefore significant to the interpretation of the combined
field value, and thus a proxy MUST NOT change the order of these field
values when a message is forwarded.

Change-Id: I1a6fe5cc8f541f8e80d559641d270d09eac9d85c
2010-07-14 08:20:40 +02:00
Dianne Hackborn
c269a13e89 am b2473fd6: am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a'

* commit 'b2473fd65c9030bb81012b07480d9243af7b1a4a':
  Fix docs build.
2010-07-13 21:18:05 -07:00
Dianne Hackborn
b2473fd65c am 021e906a: Merge "Fix docs build." into gingerbread
Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp

* commit '021e906a46f044025ce0a4632309abecd069240d':
  Fix docs build.
2010-07-13 21:14:47 -07:00
Dianne Hackborn
1d28f9c0aa Fix docs build.
Change-Id: Ibb8e1e4b18ec1e92e28d354cdcce37676056b348
2010-07-13 20:38:06 -07:00
Dianne Hackborn
2388ad9eef am f8d9379b: am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'f8d9379bd834573feca085284970cf686993c330'

* commit 'f8d9379bd834573feca085284970cf686993c330':
  IME events are now dispatched to native applications.
2010-07-13 19:50:36 -07:00
Dianne Hackborn
f8d9379bd8 am d76b67c3: IME events are now dispatched to native applications.
Merge commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320' into gingerbread-plus-aosp

* commit 'd76b67c340d1564abf8d14d976fdaf83bf2b3320':
  IME events are now dispatched to native applications.
2010-07-13 18:55:52 -07:00