35280 Commits

Author SHA1 Message Date
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
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
Adam Powell
9ab978713c Action bar API updates - new display options
Change-Id: I55e56cd7aafa53994990079e88ef85e4eb1a0b3f
2010-10-29 15:32:53 -07:00
Brad Fitzpatrick
bfb191998e StrictMode: annotate violations with the Broadcast Intent's action, if any.
Change-Id: If36ab776bb95054a109b5475c6be041c75c7e0af
2010-10-29 15:25:44 -07:00
Leon Clarke
9b8e048b55 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
Joe Onorato
170e548ac8 use the holo theme in more places for >= honeycomb apps
Change-Id: Iad2bd65eaf203df458ea689144538b7a51beb4b3
2010-10-29 14:49:13 -07:00
Leon Clarke
dff795d0e3 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
Andreas Huber
2ec6a54c6f fixing the build.
Change-Id: Ibf3686c4734e5a4ddbb93e46a1b012804d277e7e
2010-10-29 14:44:18 -07:00
Kenny Root
03034739eb Merge "Add path to get different DPI drawables" 2010-10-29 14:20:04 -07:00
Leon Clarke
5ccbe05945 DO NOT MERGE. Add assets for <select>
Bug:3133784

Cherry-picking to GB from master.

Change-Id: I7d37c22f555d0e7c59a58fdad1516d3d77bf6d14
2010-10-29 17:08:35 -04:00
Joe Onorato
0aa211db16 Merge "this is only called from the ui thread, just make the calls directly." 2010-10-29 14:06:57 -07:00
Joe Onorato
4c61aa3caf this is only called from the ui thread, just make the calls directly.
Change-Id: Iad80d04cbd38ef2922d341be307154f74eeb4774
2010-10-29 14:05:08 -07:00
Shimeng (Simon) Wang
170d2ee726 Merge "Stabilize reflow, aka, the fit-to-screen option in settings." 2010-10-29 13:58:18 -07:00
Shimeng (Simon) Wang
c55886aee8 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
2010-10-29 13:53:33 -07:00
Andreas Huber
5afb316c8c Merge "Squashed commit of the following:" 2010-10-29 13:45:41 -07:00
Daniel Sandler
069dffdf27 Quick fix for status bar crash.
Bug: 3147743
Change-Id: I0fb06b04f234b9d34349f65fede8f74b24eae988
2010-10-29 16:30:24 -04:00
Andreas Huber
69b8d69aad 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
2010-10-29 13:20:06 -07:00
Kenny Root
55fc850cf9 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
Gilles Debunne
7b9652b66b 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
2010-10-29 11:54:51 -07:00
Jason Sams
39a37dd48c Merge "Balls test app." 2010-10-29 11:41:03 -07:00
Daisuke Miyakawa
4c5585d8af Merge "Expose Adapter." 2010-10-29 11:27:59 -07:00
satok
06487a58be Add a functionarity for showing / hiding IME button on the system bar
Bug: 3077030

- IME communicates with status bar directly.

Change-Id: Ic5b6b5b7a2b8ea62372dcc9b9c36d81b9f2db651
2010-10-30 03:17:40 +09:00
Jaikumar Ganesh
e12774d4a8 Merge "Add an API call to get the ConnectionState of the Bluetooth Adapter." 2010-10-29 11:02:36 -07:00
Daniel Sandler
b0cc50de14 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
2010-10-29 13:33:24 -04:00
Jason Sams
5585e36a41 Balls test app.
Change-Id: I842f43e37145f8112120e2bd49925f81c588c40c
2010-10-29 10:28:13 -07:00
Scott Main
e5bc8f617b 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
9a8df8054b 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
1112632a41 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
c75529f59f Merge "fix interfaceflags for softap" 2010-10-29 09:58:00 -07:00
Irfan Sheriff
07bd5ae391 fix interfaceflags for softap
Change-Id: I4a4fa1e5f033c945feb64b2544b8c78618bb1f3e
Signed-off-by: jmzhu <jmzhu@marvell.com>
2010-10-29 09:54:50 -07:00
Brad Fitzpatrick
7f599a34c7 Merge "Make network usage on the main thread fatal (Honeycomb+)" 2010-10-29 09:42:48 -07:00
Brad Fitzpatrick
b6e18412af 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
2010-10-29 09:39:27 -07:00
James Dong
9085a2441d Merge "Added profile and level translation in SW video encoders" 2010-10-29 09:19:48 -07:00
Steve Block
19d928e5a5 Merge "Hook up remaining CookieManager methods" 2010-10-29 08:51:09 -07:00
Joe Onorato
f04c8816f9 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
4611bb1814 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
dbf9a02b0a 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
ba1664b34c 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