Joe Onorato
b620238a42
Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"
2010-10-31 11:41:47 -07:00
Joe Onorato
dbd9bf6592
Merge "Allow RemoteViews to silently fail when a view can't be found."
2010-10-31 11:41:22 -07:00
Romain Guy
220fb0744c
am f101a85b: am cee8d1d3: Merge "fix typo"
...
* commit 'f101a85bc3210b3c0ae9c916dd8fbdf88282caad':
fix typo
2010-10-31 11:26:31 -07:00
Romain Guy
bcd52db16e
am cee8d1d3: Merge "fix typo"
...
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
fix typo
2010-10-31 11:21:24 -07:00
Romain Guy
a290bb6aba
Merge "fix typo"
2010-10-31 11:12:51 -07:00
Dianne Hackborn
c16e2bd6e6
am c6b7b2df: (-s ours) am 70a2c15e: Final SDK API 9. DO NOT MERGE.
...
* commit 'c6b7b2dfaaab2cd8ec1940a4515b15433c83d190':
Final SDK API 9. DO NOT MERGE.
2010-10-29 19:05:38 -07:00
Dianne Hackborn
35cd3521e2
am 70a2c15e: Final SDK API 9. DO NOT MERGE.
...
* commit '70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
Final SDK API 9. DO NOT MERGE.
2010-10-29 19:03:03 -07:00
Dianne Hackborn
3e348e10ee
Merge "Add new resize mode to not resize, new web input types."
2010-10-29 18:24:03 -07:00
Scott Main
7640e636b7
am f2ca96bc: am 38fd3948: am 579db096: docs: remove another "new" tag
...
* commit 'f2ca96bcc9f5117a79c69edf11026653643419a3':
docs: remove another "new" tag
2010-10-29 17:23:24 -07:00
Scott Main
d0af840115
am 38fd3948: am 579db096: docs: remove another "new" tag
...
* commit '38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
2010-10-29 17:21:07 -07:00
Scott Main
33f2f39576
am 579db096: docs: remove another "new" tag
...
* commit '579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
2010-10-29 17:16:57 -07:00
Neal Nguyen
6071aa04db
am 2202c8b9: am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
...
* commit '2202c8b9f25c74e2b7f87090f9963683744b573e':
A little tweaking of DL Manager tests and adding better debugging output.
2010-10-29 17:12:26 -07:00
Neal Nguyen
8154016625
am 06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
...
* commit '06875afad6101892a735f79aeb2c7bdbb58c26fa':
A little tweaking of DL Manager tests and adding better debugging output.
2010-10-29 17:10:12 -07:00
Neal Nguyen
e24b6ae868
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
2010-10-29 17:07:59 -07:00
Xavier Ducrohet
83a13a7ca2
Merge "Implement the layoutlib Bitmap through a native delegate."
2010-10-29 17:07:14 -07:00
Gloria Wang
f0b9eb6c7f
Merge "Add support for WV plugin"
2010-10-29 16:58:15 -07:00
Mike Lockwood
c4ea94f0d1
Merge "Add new WRITE_MEDIA_STORAGE permission to control write access to /data/media"
2010-10-29 16:44:48 -07:00
Brad Fitzpatrick
8d23335ee4
Merge "StrictMode: annotate violations with the Broadcast Intent's action, if any."
2010-10-29 16:26:39 -07:00
James Dong
c1e0ef6070
Merge "Added some debugging log messages at stop()"
2010-10-29 16:16:39 -07:00
Gloria Wang
0f31106acf
Merge "- register DRM sniffer only when drmserver is up - notify DRM agents the status after seeking"
2010-10-29 16:15:46 -07:00
Joe Onorato
f1c64ba35b
Merge "use the holo theme in more places for >= honeycomb apps"
2010-10-29 16:10:46 -07:00
Adam Powell
ed01d5d85f
Merge "Action bar API updates - new display options"
2010-10-29 15:43:05 -07:00
Scott Main
d72681319e
am 7ffe802a: am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
...
* commit '7ffe802a2fd6f339b420172039bf5ea70d821d60':
docs: Update various SDK docs for GB platform and tools
2010-10-29 15:39:56 -07:00
Scott Main
2ebd346aa4
am 6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
...
* commit '6e8d6bd09facabcc0f868960e6453b8f79cd9136':
docs: Update various SDK docs for GB platform and tools
2010-10-29 15:37:17 -07:00
Scott Main
53c33985c6
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
2010-10-29 15:34:00 -07:00
Leon Clarke
a4daa6c54a
am dff795d0: (-s ours) am 5ccbe059: DO NOT MERGE. Add assets for <select>
...
* commit 'dff795d0e3a6d6f1e32ce32102bb13b05ed1d04b':
DO NOT MERGE. Add assets for <select>
2010-10-29 14:52:26 -07:00
Leon Clarke
3f14260637
am 5ccbe059: DO NOT MERGE. Add assets for <select>
...
* commit '5ccbe05945325dc77d543d44b69a7f80196d8cb9':
DO NOT MERGE. Add assets for <select>
2010-10-29 14:49:07 -07:00
Kenny Root
0fcc9f713b
Merge "Add path to get different DPI drawables"
2010-10-29 14:20:04 -07:00
Joe Onorato
62a9352f00
Merge "this is only called from the ui thread, just make the calls directly."
2010-10-29 14:06:57 -07:00
Shimeng (Simon) Wang
71df4924ec
Merge "Stabilize reflow, aka, the fit-to-screen option in settings."
2010-10-29 13:58:18 -07:00
Andreas Huber
894b4cfed0
Merge "Squashed commit of the following:"
2010-10-29 13:45:41 -07:00
Kenny Root
133cde5805
Add path to get different DPI drawables
...
Allow a caller to request a different density than their current display
allows. This can mean a device displaying mdpi can get a resource that's
in hdpi and have it pretend to be in mdpi resolution. If a drawable
that's returned is not in the requested density, it will set it at the
appropriate density to be scaled up later on.
The API for this is hidden currently.
Bug: 3134688
Change-Id: I6c3908cbdef4907b8d3f1576df9e3b0e7af1755a
2010-10-29 12:47:07 -07:00
Jason Sams
4fa523e6fa
Merge "Balls test app."
2010-10-29 11:41:03 -07:00
Daisuke Miyakawa
25a2300634
Merge "Expose Adapter."
2010-10-29 11:27:59 -07:00
Jaikumar Ganesh
544b698348
Merge "Add an API call to get the ConnectionState of the Bluetooth Adapter."
2010-10-29 11:02:36 -07:00
Scott Main
4e79c39153
am 9a8df805: am 1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
...
* commit '9a8df8054b2e38a27d8e8e6b17365979218f0e3f':
docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs
2010-10-29 10:26:24 -07:00
Scott Main
8ad94714bf
am 1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
...
* commit '1112632a41462c5dd34c7af9f67b88188a520517':
docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs
2010-10-29 10:24:04 -07:00
Scott Main
067ed47405
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
2010-10-29 10:03:36 -07:00
Irfan Sheriff
87ca60189c
Merge "fix interfaceflags for softap"
2010-10-29 09:58:00 -07:00
Brad Fitzpatrick
5537af9642
Merge "Make network usage on the main thread fatal (Honeycomb+)"
2010-10-29 09:42:48 -07:00
James Dong
3d6aebe49a
Merge "Added profile and level translation in SW video encoders"
2010-10-29 09:19:48 -07:00
Steve Block
05a5bd7d8b
Merge "Hook up remaining CookieManager methods"
2010-10-29 08:51:09 -07:00
Joe Onorato
cdc31f6e87
am dbf9a02b: am ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
...
* commit 'dbf9a02b0abe7cac3c15f7cc36b95d5998927ad8':
Report the new size to wallpapers when the requested size changed.
2010-10-29 08:20:42 -07:00
Nick Pelly
38e286e561
am ba1664b3: am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
...
* commit 'ba1664b34cc33ebb6b45fccedb35298ff8b1d998':
Hide some NFC API's.
2010-10-29 08:20:28 -07:00
Joe Onorato
f8fb705371
am ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
...
* commit 'ed3c7be84255d48fe7f0454bdd51b3955698cafe':
Report the new size to wallpapers when the requested size changed.
2010-10-29 08:16:20 -07:00
Nick Pelly
4cc05cf955
am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
...
* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
Hide some NFC API's.
2010-10-29 08:15:48 -07:00
Andreas Huber
e818577ef0
Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback."
2010-10-29 08:04:13 -07:00
Joe Onorato
783168c390
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
2010-10-28 18:18:52 -07:00
Gil Dobjanschi
3f8254ed90
Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations."
2010-10-28 18:03:58 -07:00
Nick Pelly
16ebd362fe
Merge "Hide some NFC API's." into gingerbread
2010-10-28 16:47:31 -07:00