35318 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
6831524a49 am ce128ae6: am b6db2d51: Merge "Bluetooth OBEX timeout problem."
* commit 'ce128ae66dc6d430aad09ad920133bc040d834c8':
  Bluetooth OBEX timeout problem.
2010-11-01 10:55:49 -07:00
Jean-Baptiste Queru
ce128ae66d am b6db2d51: Merge "Bluetooth OBEX timeout problem."
* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
  Bluetooth OBEX timeout problem.
2010-11-01 10:53:09 -07:00
Brian Carlstrom
50530c8176 Merge "Change SamplingProfiler to use a sampling interval instead of Hz" 2010-11-01 10:47:45 -07:00
Jean-Baptiste Queru
b6db2d5125 Merge "Bluetooth OBEX timeout problem." 2010-11-01 10:46:36 -07:00
Jean-Baptiste Queru
23493ac1b7 am a87cdd39: am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."
* commit 'a87cdd398fa8b46eb48b4f9a7a6b114a336e3bf2':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
2010-11-01 10:42:40 -07:00
Brian Carlstrom
504d5e0d1f Change SamplingProfiler to use a sampling interval instead of Hz
Change-Id: I15654f1c080215575347559a16ba40e9630371ba
2010-11-01 10:41:53 -07:00
Jean-Baptiste Queru
a87cdd398f am b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."
* commit 'b1fa549a49fd8fa2fe67ee30d107cc2d1486645f':
  Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
2010-11-01 10:39:01 -07:00
Jean-Baptiste Queru
b1fa549a49 Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)." 2010-11-01 10:29:22 -07:00
Andreas Huber
614d22c7f6 After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
related-to-bug: 3152363
Change-Id: Ia097bf61ca05e01365357cb23ff83e2ad417f3fd
2010-11-01 09:35:36 -07:00
Joe Onorato
6b21cdeb5f Merge "Allow both contentIntent and setOnClickPendingIntent in notifications" 2010-10-31 11:41:47 -07:00
Joe Onorato
9c3a80b236 Merge "Allow RemoteViews to silently fail when a view can't be found." 2010-10-31 11:41:22 -07:00
Joe Onorato
4058ba0526 Allow both contentIntent and setOnClickPendingIntent in notifications
From the app developer's request:

  Intents assigned to specific views should take precedence over the content intent, but it should not
  be required to set the content intent to null in order for the view-intents to work

Bug: 3107945
Change-Id: Ic5282d441277a9a8c8c700ef3f43872f3405b58a
2010-10-31 11:38:04 -07:00
Joe Onorato
2b69ce469d Allow RemoteViews to silently fail when a view can't be found.
Generally, I'm not a huge fan of allowing bugs like this, but this
will allow people to write apps with better compatibility across
configurations. They can just add a bunch of actions, and have
only some of them apply based on which views are in the layout
resource.

Bug: 3107945
Change-Id: Iecb118ce5f56421ac53a7b95ea470de9f726ee82
2010-10-31 11:35:41 -07:00
Romain Guy
8f860ef4b6 am f101a85b: am cee8d1d3: Merge "fix typo"
* commit 'f101a85bc3210b3c0ae9c916dd8fbdf88282caad':
  fix typo
2010-10-31 11:26:31 -07:00
Romain Guy
f101a85bc3 am cee8d1d3: Merge "fix typo"
* commit 'cee8d1d3450fb2b7490fbe41bf8b3f974c015f6f':
  fix typo
2010-10-31 11:21:24 -07:00
Romain Guy
cee8d1d345 Merge "fix typo" 2010-10-31 11:12:51 -07:00
Daniel Trebbien
0a675fd8fe Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907).
The Javadoc comment for class `android.content.UriMatcher` had four issues:
1. The example calls to `addURI` should not be using a leading forward slash in
   the path parameter (reported by Ester Ytterbrink).
2. The sample code to construct a `UriMatcher` was incorrect because the
   `UriMatcher` constructor takes a parameter (reported by Ross Light).
3. The code example for using `match` was incorrect because it showed two
   parameters being passed, when `match` only takes one (reported by
   Ross Light).
4. The sample `getType` implementations were incorrect because `getType` takes
   a `Uri` object, not an array of `String`s.

Change-Id: I560bff6f021c13cabf736f40ff0f47a205074291
2010-10-31 07:42:35 -07:00
Uwe Voelker
fc8daba45e fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
2010-10-31 10:08:04 +01:00
Winson Chung
aaffa8b4d4 Adding NPE check when calculating remote views memory usage.
Change-Id: I9fd4b980e45cadb980ba20d5ef1ddf150639853a
2010-10-30 14:04:35 -07:00
Joe Onorato
e4c7b3f25e Status bar: Forward the disabled state to the status bar process when it comes up.
Bug: 3108996
Change-Id: I92c2ff645dc64ca2610e3de814e0cfef6cde88c3
2010-10-30 12:15:03 -07:00
Joe Onorato
a9ad6b818f Slightly easier to read
Change-Id: I818d885999150333ec326a283f4574571c09add1
2010-10-30 12:13:13 -07:00
Dianne Hackborn
6b412445cd 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
c6b7b2dfaa 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
70a2c15ecf Final SDK API 9. DO NOT MERGE.
Change-Id: I3e2fc2ebc52eecb26ac3a6bb466447f378fb5de6
2010-10-29 18:50:47 -07:00
Adam Powell
0db3ff0bda Remove default background from Holo; add Holo.Extended themes
Change-Id: Ie3143230ebb827eb3625ffe40ee4fc24853ab9dc
2010-10-29 18:35:31 -07:00
Dianne Hackborn
7f3154d7fa Merge "Add new resize mode to not resize, new web input types." 2010-10-29 18:24:03 -07:00
Scott Main
5c95212f6a 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
f2ca96bcc9 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
38fd394815 am 579db096: docs: remove another "new" tag
* commit '579db096fa05bd077fadb04876ecf99e3ccd02b9':
  docs: remove another "new" tag
2010-10-29 17:16:57 -07:00
Scott Main
579db096fa docs: remove another "new" tag
Change-Id: I54d56f2090dee856741ea23028b51c85e526c46b
2010-10-29 17:12:37 -07:00
Neal Nguyen
5e7d4a7d01 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
2202c8b9f2 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
06875afad6 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
b4e3eb680d Merge "Implement the layoutlib Bitmap through a native delegate." 2010-10-29 17:07:14 -07:00
Dianne Hackborn
dea3ef7967 Add new resize mode to not resize, new web input types.
Change-Id: Ib098c03793d08532c3c099b59d0cc6b567e54900
2010-10-29 16:59:15 -07:00
Gloria Wang
b417115a72 Merge "Add support for WV plugin" 2010-10-29 16:58:15 -07:00
Mike Lockwood
e2160a049f Merge "Add new WRITE_MEDIA_STORAGE permission to control write access to /data/media" 2010-10-29 16:44:48 -07:00
Gloria Wang
6793a04d62 Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
2010-10-29 16:44:37 -07:00
Brad Fitzpatrick
c3cb9f2e12 Merge "StrictMode: annotate violations with the Broadcast Intent's action, if any." 2010-10-29 16:26:39 -07:00
Mike Lockwood
3f425a6be4 Add new WRITE_MEDIA_STORAGE permission to control write access to /data/media
BUG: 3113970

Change-Id: Idb56be76729dc560dee5f680225cf4050f2751d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-29 19:16:45 -04:00
James Dong
1219ea3b71 Merge "Added some debugging log messages at stop()" 2010-10-29 16:16:39 -07:00
Gloria Wang
e7a9c90103 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
84aaec86f5 Merge "use the holo theme in more places for >= honeycomb apps" 2010-10-29 16:10:46 -07:00
Gloria Wang
3f9a819a94 - register DRM sniffer only when drmserver is up
- notify DRM agents the status after seeking

Change-Id: Id77977fc7548970559dc8974461b0bd1d2aa9514
2010-10-29 16:09:48 -07:00
James Dong
42338ff07f Added some debugging log messages at stop()
There are so many cases where the codecs just could not stopped ...

Change-Id: If9ff261fcd4726c2ee21ec7c9336ca9c2917d399
2010-10-29 16:07:44 -07:00
Xavier Ducrohet
5de11a18e9 Implement the layoutlib Bitmap through a native delegate.
This does not implement all the native methods of the
android.graphics.Bitmap class, only what's needed to draw an
ImageView object. The rest will be implemented after Canvas and
Paint have been moved to the native delegate.

Change-Id: Ia0c3b2cafa03871c298deaef5817a25ac1c35521
2010-10-29 16:01:40 -07:00
Adam Powell
2308628a20 Merge "Action bar API updates - new display options" 2010-10-29 15:43:05 -07:00
Scott Main
723aa7088f 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
7ffe802a2f 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
6e8d6bd09f Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread 2010-10-29 15:34:00 -07:00