12354 Commits

Author SHA1 Message Date
Joe Onorato
4ca7f1e281 Implement reminder power dialog and invalid charger dialog.
Bug: 2510318
Bug: 2974431
Change-Id: I92eb419eeffb657e5572a35a490735a96b303d6b
2010-10-27 19:24:51 -07:00
Steve Block
f3bac948e4 Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack" 2010-10-27 12:29:03 -07:00
Steve Block
0d4fd36709 Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack" 2010-10-27 11:47:45 -07:00
Amith Yamasani
29ab7d8501 Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens." 2010-10-27 11:04:43 -07:00
Amith Yamasani
27da0bf0a3 Fix sub-header height to follow drawable. Floating panels for Preference screens. 2010-10-27 11:03:22 -07:00
Nick Pelly
449fb2de1b am 222f489f: am 6d55e134: Make best effort attempt to recover NFC service when it dies. 2010-10-27 10:46:23 -07:00
Nick Pelly
222f489fc0 am 6d55e134: Make best effort attempt to recover NFC service when it dies. 2010-10-27 10:43:19 -07:00
Steve Block
dcd2d0dee9 Hook up CookieManager.getCookie() for Chromium HTTP stack
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76603

Bug: 3116410
Change-Id: Id0cd5871fd13f952d4f2aa963576a4e610459a18
2010-10-27 17:13:48 +01:00
Leon Scroggins
81bd788ecf Make sure nativeMotionUp is called.
If someone sets mLogEvent to false to prevent logging,
nativeMotionUp will not be called, so touches to WebView
will no longer work.  Make sure this does not happen.

Change-Id: Ie79ccc68677cea2f686f7c7da734bf719910f583
2010-10-27 10:31:05 -04:00
Steve Block
b5ac9de4b5 Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack
Also requires a change to external/webkit ...
https://android-git.corp.google.com/g/76066

Bug: 3116410
Change-Id: If8562468708e7d68c5be53db3860647687ebf3bd
2010-10-27 14:06:54 +01:00
Steve Block
82d9816136 Update Chromium HTTP stack to get database and cache paths from CookieSyncManager
Currently these paths are obtained from the BrowserFrame via JNI.
However, the paths are not synced to the BrowserFrame until the
WebCore thread has started up. This means that if the
WebRequestContext is created on the IO thread, the paths may not be
available.

This change moves the paths from BrowserFrame to CookieSyncManager to
avoid the need to wait for the WebCore thread.

Note that the new methods may be called on either the UI or WebCore
threads, so are synchronised.

Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76579

Change-Id: I8e910ee209c570e90181bd308a78d1987b4d120c
2010-10-27 14:06:53 +01:00
Iain Merrick
2bcd292da9 Strip off MIME types when loading content URLs.
Matching behaviour that has been in ContentLoader.java since
approximately day 0. Without this, we can't load Gmail attachments
with the Chrome HTTP stack because of permission errors -- we have
to load exactly the URL Gmail tells us.

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

Change-Id: I764036efd428299b2fcd611b62dc046a40d80a55
2010-10-27 12:33:09 +01:00
Iain Merrick
2723d06033 Merge "Only AV formats should be handled by MediaPlayer (Java side)" 2010-10-27 03:31:01 -07:00
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
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
Romain Guy
0d9275e565 Enable display lists.
Change-Id: Id0d9b987251da5b7ecbb5497a55dbb5937430316
2010-10-26 14:22:30 -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
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
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
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
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
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
Jaikumar Ganesh
8febf88618 Add logs to debug incoming A2DP connection issue.
Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
2010-10-26 00:28:39 -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
a46f2fb152 Implement ACTION_CONNECTION_STATE_CHANGED intent.
Change-Id: I6b5783c189c9796ebd85d9d54bdcb07949bef27e
2010-10-25 18:44:57 -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
Romain Guy
551397d5eb Merge "Don't initialize the hw renderer without a valid surface. Bug #3054952" 2010-10-25 15:36:18 -07:00
Romain Guy
c361da845a Don't initialize the hw renderer without a valid surface.
Bug #3054952

Change-Id: I5b4074391dbd84b04a14f7d2fb1b9a4a2487e1e2
2010-10-25 15:29:10 -07:00
Adam Cohen
c18b2e504a Merge "-> Fixing a bug where AdapterViewAnimator doesn't refresh correctly -> Reduced swipe threshold for StackView Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1" 2010-10-25 14:11:00 -07:00
Adam Cohen
a9238c89a4 -> Fixing a bug where AdapterViewAnimator doesn't refresh correctly
-> Reduced swipe threshold for StackView
Change-Id: I0f04f45dade57f29581fe03fb195a6db5f12adb1
2010-10-25 14:03:11 -07:00
Shimeng (Simon) Wang
346f97f82f Fix the viewport height to view height when title bar is visible.
issue: 3097787
Change-Id: Ie685a94262cecd94f32dbb94991fea76ceb43b94
2010-10-25 13:33:31 -07:00
Vasu Nori
6db925001e Merge "increase sql statement printed in finalier warnings from 100 to 1000" 2010-10-25 12:08:46 -07:00
Vasu Nori
ba42fb3a25 Merge "when printing cache-full warning, print the sql statements in cache" 2010-10-25 12:07:57 -07:00
Adam Powell
67bb674196 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread
Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test
2010-10-25 12:07:51 -07:00
Vasu Nori
b73cf1cc39 increase sql statement printed in finalier warnings from 100 to 1000
100 for sql statement seems too small for some apps (gmail is one example)

Change-Id: I4d29bffc0da5a854ca650d083b81df8769b35b77
2010-10-25 11:55:56 -07:00