OSDN Git Service
Gloria Wang [Mon, 1 Nov 2010 19:08:30 +0000 (12:08 -0700)]
Media scanner support for FL(Forward Lock) DRM file types
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:55:49 +0000 (10:55 -0700)]
am
ce128ae6: am
b6db2d51: Merge "Bluetooth OBEX timeout problem."
* commit '
ce128ae66dc6d430aad09ad920133bc040d834c8':
Bluetooth OBEX timeout problem.
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:53:09 +0000 (10:53 -0700)]
am
b6db2d51: Merge "Bluetooth OBEX timeout problem."
* commit '
b6db2d5125511284ee0962dd85d9be0099e51b22':
Bluetooth OBEX timeout problem.
Brian Carlstrom [Mon, 1 Nov 2010 17:47:45 +0000 (10:47 -0700)]
Merge "Change SamplingProfiler to use a sampling interval instead of Hz"
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:46:36 +0000 (10:46 -0700)]
Merge "Bluetooth OBEX timeout problem."
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:42:40 +0000 (10:42 -0700)]
am
a87cdd39: am
b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (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).
Brian Carlstrom [Mon, 1 Nov 2010 17:41:53 +0000 (10:41 -0700)]
Change SamplingProfiler to use a sampling interval instead of Hz
Change-Id: I15654f1c080215575347559a16ba40e9630371ba
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:39:01 +0000 (10:39 -0700)]
am
b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (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).
Jean-Baptiste Queru [Mon, 1 Nov 2010 17:29:22 +0000 (10:29 -0700)]
Merge "Fixes Issue 7907 in the public bugs database (code.google.com/p/android/issues/detail?id=7907)."
Andreas Huber [Fri, 29 Oct 2010 22:47:52 +0000 (15:47 -0700)]
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
Joe Onorato [Sun, 31 Oct 2010 18:41:47 +0000 (11:41 -0700)]
Merge "Allow both contentIntent and setOnClickPendingIntent in notifications"
Joe Onorato [Sun, 31 Oct 2010 18:41:22 +0000 (11:41 -0700)]
Merge "Allow RemoteViews to silently fail when a view can't be found."
Joe Onorato [Sun, 31 Oct 2010 18:38:04 +0000 (11:38 -0700)]
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
Joe Onorato [Sun, 31 Oct 2010 18:35:41 +0000 (11:35 -0700)]
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
Romain Guy [Sun, 31 Oct 2010 18:26:31 +0000 (11:26 -0700)]
Romain Guy [Sun, 31 Oct 2010 18:21:24 +0000 (11:21 -0700)]
Romain Guy [Sun, 31 Oct 2010 18:12:51 +0000 (11:12 -0700)]
Merge "fix typo"
Daniel Trebbien [Sun, 31 Oct 2010 14:42:35 +0000 (07:42 -0700)]
Fixes Issue 7907 in the public bugs database (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
Uwe Voelker [Sun, 31 Oct 2010 09:08:04 +0000 (10:08 +0100)]
fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
Winson Chung [Sat, 30 Oct 2010 21:04:05 +0000 (14:04 -0700)]
Adding NPE check when calculating remote views memory usage.
Change-Id: I9fd4b980e45cadb980ba20d5ef1ddf150639853a
Joe Onorato [Sat, 30 Oct 2010 19:15:03 +0000 (12:15 -0700)]
Status bar: Forward the disabled state to the status bar process when it comes up.
Bug:
3108996
Change-Id: I92c2ff645dc64ca2610e3de814e0cfef6cde88c3
Joe Onorato [Sat, 30 Oct 2010 19:13:13 +0000 (12:13 -0700)]
Slightly easier to read
Change-Id: I818d885999150333ec326a283f4574571c09add1
Dianne Hackborn [Sat, 30 Oct 2010 02:05:38 +0000 (19:05 -0700)]
am
c6b7b2df: (-s ours) am
70a2c15e: Final SDK API 9. DO NOT MERGE.
* commit '
c6b7b2dfaaab2cd8ec1940a4515b15433c83d190':
Final SDK API 9. DO NOT MERGE.
Dianne Hackborn [Sat, 30 Oct 2010 02:03:03 +0000 (19:03 -0700)]
am
70a2c15e: Final SDK API 9. DO NOT MERGE.
* commit '
70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
Final SDK API 9. DO NOT MERGE.
Dianne Hackborn [Wed, 27 Oct 2010 19:31:34 +0000 (12:31 -0700)]
Final SDK API 9. DO NOT MERGE.
Change-Id: I3e2fc2ebc52eecb26ac3a6bb466447f378fb5de6
Adam Powell [Sat, 30 Oct 2010 01:15:13 +0000 (18:15 -0700)]
Remove default background from Holo; add Holo.Extended themes
Change-Id: Ie3143230ebb827eb3625ffe40ee4fc24853ab9dc
Dianne Hackborn [Sat, 30 Oct 2010 01:24:03 +0000 (18:24 -0700)]
Merge "Add new resize mode to not resize, new web input types."
Scott Main [Sat, 30 Oct 2010 00:23:24 +0000 (17:23 -0700)]
am
f2ca96bc: am
38fd3948: am
579db096: docs: remove another "new" tag
* commit '
f2ca96bcc9f5117a79c69edf11026653643419a3':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:21:07 +0000 (17:21 -0700)]
am
38fd3948: am
579db096: docs: remove another "new" tag
* commit '
38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:16:57 +0000 (17:16 -0700)]
am
579db096: docs: remove another "new" tag
* commit '
579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:12:37 +0000 (17:12 -0700)]
docs: remove another "new" tag
Change-Id: I54d56f2090dee856741ea23028b51c85e526c46b
Neal Nguyen [Sat, 30 Oct 2010 00:12:26 +0000 (17:12 -0700)]
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.
Neal Nguyen [Sat, 30 Oct 2010 00:10:12 +0000 (17:10 -0700)]
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.
Neal Nguyen [Sat, 30 Oct 2010 00:07:59 +0000 (17:07 -0700)]
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
Xavier Ducrohet [Sat, 30 Oct 2010 00:07:14 +0000 (17:07 -0700)]
Merge "Implement the layoutlib Bitmap through a native delegate."
Dianne Hackborn [Thu, 28 Oct 2010 21:24:22 +0000 (14:24 -0700)]
Add new resize mode to not resize, new web input types.
Change-Id: Ib098c03793d08532c3c099b59d0cc6b567e54900
Gloria Wang [Fri, 29 Oct 2010 23:58:15 +0000 (16:58 -0700)]
Merge "Add support for WV plugin"
Mike Lockwood [Fri, 29 Oct 2010 23:44:48 +0000 (16:44 -0700)]
Merge "Add new WRITE_MEDIA_STORAGE permission to control write access to /data/media"
Gloria Wang [Fri, 29 Oct 2010 23:44:37 +0000 (16:44 -0700)]
Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
Brad Fitzpatrick [Fri, 29 Oct 2010 23:26:39 +0000 (16:26 -0700)]
Merge "StrictMode: annotate violations with the Broadcast Intent's action, if any."
Mike Lockwood [Fri, 29 Oct 2010 15:53:39 +0000 (11:53 -0400)]
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>
James Dong [Fri, 29 Oct 2010 23:16:39 +0000 (16:16 -0700)]
Merge "Added some debugging log messages at stop()"
Gloria Wang [Fri, 29 Oct 2010 23:15:46 +0000 (16:15 -0700)]
Merge "- register DRM sniffer only when drmserver is up - notify DRM agents the status after seeking"
Joe Onorato [Fri, 29 Oct 2010 23:10:46 +0000 (16:10 -0700)]
Merge "use the holo theme in more places for >= honeycomb apps"
Gloria Wang [Fri, 29 Oct 2010 21:50:17 +0000 (14:50 -0700)]
- register DRM sniffer only when drmserver is up
- notify DRM agents the status after seeking
Change-Id: Id77977fc7548970559dc8974461b0bd1d2aa9514
James Dong [Fri, 29 Oct 2010 23:01:06 +0000 (16:01 -0700)]
Added some debugging log messages at stop()
There are so many cases where the codecs just could not stopped ...
Change-Id: If9ff261fcd4726c2ee21ec7c9336ca9c2917d399
Xavier Ducrohet [Fri, 29 Oct 2010 23:01:40 +0000 (16:01 -0700)]
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
Adam Powell [Fri, 29 Oct 2010 22:43:05 +0000 (15:43 -0700)]
Merge "Action bar API updates - new display options"
Scott Main [Fri, 29 Oct 2010 22:39:56 +0000 (15:39 -0700)]
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
Scott Main [Fri, 29 Oct 2010 22:37:17 +0000 (15:37 -0700)]
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
Scott Main [Fri, 29 Oct 2010 22:34:00 +0000 (15:34 -0700)]
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
Adam Powell [Wed, 27 Oct 2010 04:47:29 +0000 (21:47 -0700)]
Action bar API updates - new display options
Change-Id: I55e56cd7aafa53994990079e88ef85e4eb1a0b3f
Brad Fitzpatrick [Fri, 29 Oct 2010 22:25:44 +0000 (15:25 -0700)]
StrictMode: annotate violations with the Broadcast Intent's action, if any.
Change-Id: If36ab776bb95054a109b5475c6be041c75c7e0af
Neal Nguyen [Mon, 25 Oct 2010 01:02:45 +0000 (18:02 -0700)]
A little tweaking of DL Manager tests and adding better debugging output.
Adding more detail to the output logging to help track down issues, fixing some
download completed notification counter flakiness and making reboot test more
robust, and reducing the number of concurrent downloads in testMultipleDownloads()
to 10. After talking with Vasu, this is probably more appropriate as it is
closer to typical usage scenarios, and as a side effect should trim some
time from the test runs. Large numbers of downloads will be left for stress
testing.
Change-Id: Ie337cfe9b8d27299d70553e39c60e241ff3afe66
Leon Clarke [Fri, 29 Oct 2010 21:52:26 +0000 (14:52 -0700)]
am
dff795d0: (-s ours) am
5ccbe059: DO NOT MERGE. Add assets for <select>
* commit '
dff795d0e3a6d6f1e32ce32102bb13b05ed1d04b':
DO NOT MERGE. Add assets for <select>
Joe Onorato [Fri, 29 Oct 2010 20:26:11 +0000 (13:26 -0700)]
use the holo theme in more places for >= honeycomb apps
Change-Id: Iad2bd65eaf203df458ea689144538b7a51beb4b3
Leon Clarke [Fri, 29 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am
5ccbe059: DO NOT MERGE. Add assets for <select>
* commit '
5ccbe05945325dc77d543d44b69a7f80196d8cb9':
DO NOT MERGE. Add assets for <select>
Andreas Huber [Fri, 29 Oct 2010 21:38:48 +0000 (14:38 -0700)]
fixing the build.
Change-Id: Ibf3686c4734e5a4ddbb93e46a1b012804d277e7e
Kenny Root [Fri, 29 Oct 2010 21:20:04 +0000 (14:20 -0700)]
Merge "Add path to get different DPI drawables"
Leon Clarke [Thu, 18 Mar 2010 13:42:56 +0000 (13:42 +0000)]
DO NOT MERGE. Add assets for <select>
Bug:
3133784
Cherry-picking to GB from master.
Change-Id: I7d37c22f555d0e7c59a58fdad1516d3d77bf6d14
Joe Onorato [Fri, 29 Oct 2010 21:06:57 +0000 (14:06 -0700)]
Merge "this is only called from the ui thread, just make the calls directly."
Joe Onorato [Fri, 29 Oct 2010 20:37:30 +0000 (13:37 -0700)]
this is only called from the ui thread, just make the calls directly.
Change-Id: Iad80d04cbd38ef2922d341be307154f74eeb4774
Shimeng (Simon) Wang [Fri, 29 Oct 2010 20:58:18 +0000 (13:58 -0700)]
Merge "Stabilize reflow, aka, the fit-to-screen option in settings."
Shimeng (Simon) Wang [Thu, 28 Oct 2010 20:46:02 +0000 (13:46 -0700)]
Stabilize reflow, aka, the fit-to-screen option in settings.
This change is only for tablet device which has large screen and
good for fixed viewport.
The reflow will only happen in first layout and double tap if the
text wrap scale is not desired.
The initial text wrap scale is set to the reading level, so that if
the web page is in overview mode, after a double tap, the text will
be nicely shown full screen without any reflow.
All the previous reflowing, such as done when zoomed out, are disabled for
tablet device.
issue:
3003933
Change-Id: I8f460704bb27c50d6f5fa259ca2d5007648adfba
Andreas Huber [Fri, 29 Oct 2010 20:45:41 +0000 (13:45 -0700)]
Merge "Squashed commit of the following:"
Daniel Sandler [Fri, 29 Oct 2010 20:30:24 +0000 (16:30 -0400)]
Quick fix for status bar crash.
Bug:
3147743
Change-Id: I0fb06b04f234b9d34349f65fede8f74b24eae988
Andreas Huber [Fri, 29 Oct 2010 19:00:20 +0000 (12:00 -0700)]
Squashed commit of the following:
commit
0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:59:23 2010 -0700
suspend() and resume() methods on VideoView are back but don't do anything.
They need to be back because they were public before.
Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425
commit
16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:47:05 2010 -0700
Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."
This reverts commit
2e1818a4d16c3309660f27286c77d8d1eee95a25.
Conflicts:
api/current.xml
Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5
commit
8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:16 2010 -0700
Revert "Release mediaplayer if the current state is not suspending. Fix for bug
2480093."
This reverts commit
efb882cf75eef39ecaf9f8920ed302a019fa629f.
commit
f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:08 2010 -0700
Revert "Release MediaPlayer if suspend() returns false."
This reverts commit
047212fd4ea360675e94d3ce83c7f5544f65b268.
commit
441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:40:46 2010 -0700
manually.
Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87
Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
Kenny Root [Thu, 28 Oct 2010 21:47:01 +0000 (14:47 -0700)]
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
Gilles Debunne [Tue, 26 Oct 2010 23:27:12 +0000 (16:27 -0700)]
New Paste view on top of insertion point in TextViews.
Tapping on the insertion handle displays a new pop-up dialog that allows to paste.
Select all icon removed.
Change-Id: I6b8c088dd5930c3f67b38928fd43cdd5c9da0904
Jason Sams [Fri, 29 Oct 2010 18:41:03 +0000 (11:41 -0700)]
Merge "Balls test app."
Daisuke Miyakawa [Fri, 29 Oct 2010 18:27:59 +0000 (11:27 -0700)]
Merge "Expose Adapter."
satok [Fri, 29 Oct 2010 02:37:18 +0000 (11:37 +0900)]
Add a functionarity for showing / hiding IME button on the system bar
Bug:
3077030
- IME communicates with status bar directly.
Change-Id: Ic5b6b5b7a2b8ea62372dcc9b9c36d81b9f2db651
Jaikumar Ganesh [Fri, 29 Oct 2010 18:02:36 +0000 (11:02 -0700)]
Merge "Add an API call to get the ConnectionState of the Bluetooth Adapter."
Daniel Sandler [Tue, 26 Oct 2010 20:55:56 +0000 (16:55 -0400)]
Notification flyovers.
Hold your finger on an individual notification icon to
quickly show that notification's payload.
Also: Quickly swipe up on any icon to open the tray.
Bug:
2994009
Change-Id: I2ae2b546fcfa62994b63b9376f487289b2d06796
Jason Sams [Fri, 29 Oct 2010 17:19:21 +0000 (10:19 -0700)]
Balls test app.
Change-Id: I842f43e37145f8112120e2bd49925f81c588c40c
Scott Main [Fri, 29 Oct 2010 17:26:24 +0000 (10:26 -0700)]
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
Scott Main [Fri, 29 Oct 2010 17:24:04 +0000 (10:24 -0700)]
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
Scott Main [Fri, 29 Oct 2010 17:03:36 +0000 (10:03 -0700)]
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
Irfan Sheriff [Fri, 29 Oct 2010 16:58:00 +0000 (09:58 -0700)]
Merge "fix interfaceflags for softap"
Irfan Sheriff [Thu, 28 Oct 2010 21:45:56 +0000 (14:45 -0700)]
fix interfaceflags for softap
Change-Id: I4a4fa1e5f033c945feb64b2544b8c78618bb1f3e
Signed-off-by: jmzhu <jmzhu@marvell.com>
Brad Fitzpatrick [Fri, 29 Oct 2010 16:42:48 +0000 (09:42 -0700)]
Merge "Make network usage on the main thread fatal (Honeycomb+)"
Brad Fitzpatrick [Thu, 28 Oct 2010 21:50:05 +0000 (14:50 -0700)]
Make network usage on the main thread fatal (Honeycomb+)
For apps targetting Honeycomb SDK or above, make network usage on the
main thread (aka event thread, Looper thread, UI thread) be fatal.
If an app is targetting a previous SDK version, they're grandfathered
into the older (lack of) rules.
Bug: 786847
Change-Id: Ia4ae77b8369567ee526c96b930d523bc722b0bc9
James Dong [Fri, 29 Oct 2010 16:19:48 +0000 (09:19 -0700)]
Merge "Added profile and level translation in SW video encoders"
Steve Block [Fri, 29 Oct 2010 15:51:09 +0000 (08:51 -0700)]
Merge "Hook up remaining CookieManager methods"
Joe Onorato [Fri, 29 Oct 2010 15:20:42 +0000 (08:20 -0700)]
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.
Nick Pelly [Fri, 29 Oct 2010 15:20:28 +0000 (08:20 -0700)]
am
ba1664b3: am
4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '
ba1664b34cc33ebb6b45fccedb35298ff8b1d998':
Hide some NFC API's.
Joe Onorato [Fri, 29 Oct 2010 15:16:20 +0000 (08:16 -0700)]
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.
Nick Pelly [Fri, 29 Oct 2010 15:15:48 +0000 (08:15 -0700)]
am
4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '
4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
Hide some NFC API's.
Andreas Huber [Fri, 29 Oct 2010 15:04:13 +0000 (08:04 -0700)]
Merge "Upgrade to the latest version of libwebm to fix YouTube webm playback."
Ben Murdoch [Thu, 28 Oct 2010 17:24:57 +0000 (18:24 +0100)]
Add a class that stores localised strings used by libchromium.
These are loaded by the first WebView to be instantiated and read
over JNI by libchromium in external/chromium/android/app/l10n_util.cc
Change-Id: I43d6e5a061691689d28cba2697fedcd27548af08
Bjorn Bringert [Tue, 21 Sep 2010 11:21:18 +0000 (12:21 +0100)]
Deprecate Settings.System.SHOW_WEB_SUGGESTIONS
In earlier Android versions, Quick Search Box set this setting,
and the browser and QSB read it. Now the Browser has stopped
using it, and QSB has been unbundled and removed from the system
settings UI.
Applications that show web suggestions should have their own settings
to control it instead.
Bug:
3021480
Change-Id: I4e62bf26944287f804e50eb93843484a0356fffb
Scott Main [Thu, 28 Oct 2010 07:02:31 +0000 (00:02 -0700)]
docs: Update various SDK docs for GB platform and tools
Change-Id: I8ccb296e5fba57743197bec140e9c79750f0d4f6
Joe Onorato [Fri, 29 Oct 2010 01:18:52 +0000 (18:18 -0700)]
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
Joe Onorato [Fri, 29 Oct 2010 01:03:23 +0000 (18:03 -0700)]
Report the new size to wallpapers when the requested size changed.
We were telling the app, but we weren't saving the data for ourselves.
This also tells them to re-scroll when there's a new size.
Bug:
3144373
Change-Id: I9d12b714119ff02dd7d7f1cfa997d8a44475b9e9
Gil Dobjanschi [Fri, 29 Oct 2010 01:03:58 +0000 (18:03 -0700)]
Merge "Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations."
Nick Pelly [Thu, 28 Oct 2010 23:47:31 +0000 (16:47 -0700)]
Merge "Hide some NFC API's." into gingerbread
Scott Main [Fri, 22 Oct 2010 18:29:57 +0000 (11:29 -0700)]
docs: revise javadocs for sip
add a package description, revise class descriptions and edit some method docs
Change-Id: Ice969a99c830349674c65d99e4b7a6f1d2f24a7e
Gil Dobjanschi [Thu, 28 Oct 2010 23:24:41 +0000 (16:24 -0700)]
Bug fix: Use getDuration vs. getTimelineDuration in Effect and Overlay limits calculations.
Change-Id: I5f619807435dc75c285446bfd60327bc1c1ecacd
Wink Saville [Thu, 28 Oct 2010 23:05:56 +0000 (16:05 -0700)]
Merge "Remove an @Override that is not needed."
Jamie Gennis [Thu, 28 Oct 2010 22:44:11 +0000 (15:44 -0700)]
Merge "OpenGL ES 1 YUV texturing test"