15226 Commits

Author SHA1 Message Date
Iain Merrick
4e7665d2b9 Only AV formats should be handled by MediaPlayer (Java side)
Must be submitted with corresponding C++ change (I50da7599).

When opening a text file in the browser, WebKit was attempting to
display it as a movie. This is because the media player now reports
that it can handle various document formats, including plain text.

See http://b/issue?id=3132917

This CL updates WebViewCore.supportsMimeType() to explicitly check
for audio and video formats only. This is called from WebKit via
JNI, and doesn't seem to be used elsewhere, so it should be a safe
change to make. Renamed to isSupportedMediaMimeType() for clarity.

Test: push a text file to /sdcard/foo.txt, and open it in the
browser (as file:///sdcard/foo.txt).

Change-Id: Id39b770b05ced7c976d8043649845f26115b24c9
2010-10-27 11:28:30 +01:00
Nick Pelly
6d55e1342f Make best effort attempt to recover NFC service when it dies.
Retrieve the service again from ServiceManager on RemoteException.

Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-27 01:15:32 -07:00
satok
86417ea3f8 Remove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER
Change-Id: I467cfba9644ec266f6a98f7aec0886ad205fef4f
2010-10-27 15:27:22 +09:00
Daisuke Miyakawa
53daead571 Expose Adapter.
We sometimes want just an adapter object instead of Fragment,
so that it can be available from not-Fragment UI
(like Spinner and ListView).

See I5e3d7ee721d1f0ec81dc9825b0d05f8faa731b80 for example usage.

Bug: 3133251
Change-Id: Ief6f25e9bc51c739b5cd2f2ba0afec5d2c16dc5b
2010-10-26 16:09:14 -07:00
Irfan Sheriff
a8413beb39 Merge "WifiLock extensions for high performance mode" 2010-10-26 16:08:29 -07:00
Jaikumar Ganesh
c53cab20b2 Add an API call to get the ConnectionState of the Bluetooth Adapter.
Change-Id: Icd87d7720189034946aaa98e1a6c5d03ef4219e5
2010-10-26 16:03:01 -07:00
Adam Cohen
e1838c773d Merge "- Made showNext() and showPrevious() on StackView remotable - Made StackView show the transition when showNext() or showPrevious() is called" 2010-10-26 15:51:57 -07:00
Adam Cohen
3352b6807f - Made showNext() and showPrevious() on StackView remotable
- Made StackView show the transition when showNext() or
  showPrevious() is called

Change-Id: Id6e3e6d9ff374c037323f77d247f1a1e4398009e
2010-10-26 15:46:31 -07:00
Dianne Hackborn
adf840ea0c Merge "ClipDescription no longer inherits from ClipData." 2010-10-26 15:25:18 -07:00
Dianne Hackborn
f834dfabbc ClipDescription no longer inherits from ClipData.
Change-Id: Ie4939f87c7e1628d9c19ecb5c0b3036d1f76ef29
2010-10-26 15:23:15 -07:00
Romain Guy
2d38cc80af Merge "Enable display lists." 2010-10-26 14:26:15 -07:00
Eric Rowe
826af6266c Modify bluetooth test cases GB for new HC APIs
Modify bluetooth stress tests pairing and connection test cases for new
honeycomb bluetooth APIs and severly refactor code, including better
organization of broadcast receivers, using broadcast receivers to record
the time (instead of getting the time at the end of the poll).

Change-Id: I3ef28d54d1a013697f67f4c7c8a96aaadcc747d9
2010-10-26 14:23:44 -07:00
Romain Guy
0d9275e565 Enable display lists.
Change-Id: Id0d9b987251da5b7ecbb5497a55dbb5937430316
2010-10-26 14:22:30 -07:00
Irfan Sheriff
5876a4273e WifiLock extensions for high performance mode
Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
2010-10-26 13:25:03 -07:00
Chet Haase
9440083be2 Merge "Optimizing ColorFilter in display lists" 2010-10-26 12:53:57 -07:00
Chet Haase
ad93c2bb63 Optimizing ColorFilter in display lists
Change-Id: Ie4d5e5b0bc45e0ce47bba144049303c270762e54
2010-10-26 12:52:03 -07:00
Jeff Hamilton
eb1f2de631 am f56aac4b: am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:18:08 -07:00
Jeff Hamilton
f56aac4b6e am d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread 2010-10-26 12:16:10 -07:00
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
2010-10-26 14:09:48 -05:00
Jaikumar Ganesh
7d0f553852 Merge "Fix A2DP connection problem, if disconnected while playing music." 2010-10-26 11:31:44 -07:00
Patrick Scott
bb8300e155 Merge "Fix debug statements and aapt assert." 2010-10-26 11:26:19 -07:00
Jaikumar Ganesh
b2ec4fa8d7 Fix A2DP connection problem, if disconnected while playing music.
Change-Id: I594564c11dc1698f00f9db3e6f6e4f8da9e2fe69
2010-10-26 11:22:48 -07:00
Dianne Hackborn
78098341f8 Merge "Fix issue #3130426: Finsky crash in switching from window carousel" 2010-10-26 11:20:06 -07:00
Gilles Debunne
5b78d8a886 Merge "New Holo style for Tabs." 2010-10-26 11:18:51 -07:00
Dianne Hackborn
fb3cffeb35 Fix issue #3130426: Finsky crash in switching from window carousel
Need to note that we no longer have saved state before delivering
results or new intents to an activity.

Also do some work on loaders to prevent apps from making fragment
changes as a result of receiving loader data.  This makes apps
consistent crash in a case that they would previously sometimes
crash (if they got the loader data after onPause).

Change-Id: I46e9e46d0aa05d9d7d6a275a2a488a18a20a5747
2010-10-26 11:09:54 -07:00
Gilles Debunne
44c1473c03 New Holo style for Tabs.
Holo theme with new assets and style for TabWidgets.

Legacy Themes still use GB style.

Assets added in a previous bluk update were removed.

Change-Id: Ia4a612678561fa5047bbd2a72488086c0f3d61a1
2010-10-26 11:08:05 -07:00
Irfan Sheriff
f235c5ab91 add wps pin from device capability
Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
2010-10-26 10:48:11 -07:00
Patrick Scott
4f145c9674 Fix debug statements and aapt assert.
ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
2010-10-26 13:22:17 -04:00
Shimeng (Simon) Wang
48c9daac20 Merge "Fix the viewport height to view height when title bar is visible." 2010-10-26 10:05:20 -07:00
Ben Murdoch
b9aa1d9d60 Merge "Update WebView useragent string for merge to WebKit r70209" 2010-10-26 07:44:34 -07:00
Jeff Hamilton
858825c54d am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:28:57 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Ben Murdoch
566440cf3d Update WebView useragent string for merge to WebKit r70209
Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68
2010-10-26 15:23:30 +01:00
Chet Haase
dcaff67a80 Merge "DisplayList optimizations and fixes." 2010-10-26 06:59:19 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
2010-10-26 08:59:18 -05:00
Chet Haase
d98aa2de9a DisplayList optimizations and fixes.
We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.

Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
2010-10-26 06:54:55 -07:00
Jaikumar Ganesh
de9878d44f Merge "Add logs to debug incoming A2DP connection issue." 2010-10-26 00:32:06 -07:00
Jaikumar Ganesh
8febf88618 Add logs to debug incoming A2DP connection issue.
Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
2010-10-26 00:28:39 -07:00
Jaikumar Ganesh
e8b7f399f1 Merge "Clean up some logging to make it more useful to debug." 2010-10-26 00:18:31 -07:00
Jaikumar Ganesh
b1ef244732 Clean up some logging to make it more useful to debug.
Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
2010-10-26 00:15:45 -07:00
Jaikumar Ganesh
bac9c29437 Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent." 2010-10-25 19:41:57 -07:00
Jaikumar Ganesh
a46f2fb152 Implement ACTION_CONNECTION_STATE_CHANGED intent.
Change-Id: I6b5783c189c9796ebd85d9d54bdcb07949bef27e
2010-10-25 18:44:57 -07:00
Adam Powell
c841ef04eb Merge "Holo: vertical dividers, group button states, default window backgrounds." 2010-10-25 17:44:35 -07:00
Adam Powell
5d2b178f5c Holo: vertical dividers, group button states, default window backgrounds.
Change-Id: I06b1397a8026d01a2e4eca7e87ca2d1edbe4f92e
2010-10-25 17:32:53 -07:00
Jaikumar Ganesh
5514029304 Fix docs builds.
Change-Id: I764bd0f0f6994cc468b7ebbea4a3dc7a44b9f89d
2010-10-25 17:07:51 -07:00
Jaikumar Ganesh
657dbfaedb Merge "Expose Vendor Specific Headset Event Intent." 2010-10-25 16:43:41 -07:00
Jaikumar Ganesh
9bb1278696 Merge "Make setting the adapter properties asynchronous." 2010-10-25 16:38:48 -07:00
Jaikumar Ganesh
ff7db40be1 Make setting the adapter properties asynchronous.
1. These involve disk operations and multiple processes.
2. onPropertyChange already informs us asychronously.
3. Settings app is the only user, will have to revisit the function
   if we make them public.

Change-Id: If019a83c05a0c9e625f27faf99063d33f369f0d8
2010-10-25 16:36:45 -07:00
Eric Fischer
b2ddeee2d2 am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp

* commit '3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
  Import revised translations.  DO NOT MERGE
2010-10-25 16:19:42 -07:00
Eric Fischer
3d1ce9ec2a Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-25 16:14:47 -07:00