21875 Commits

Author SHA1 Message Date
Narayan Kamath
81754949e0 Merge "Write unit tests for android.speech.tts." 2012-01-11 03:39:57 -08:00
Jeff Sharkey
2cc28deb9e Merge "Move non-monotonic reporting to interface." 2012-01-10 17:41:01 -08:00
Jeff Sharkey
5a7bcf31a4 Move non-monotonic reporting to interface.
Report non-monotonic NetworkStats through an observer interface
instead of throwing, since those events are still recoverable.

Change-Id: Ic0749f4634b0ac05dbe90e95ca490957ec8b2f23
2012-01-10 17:24:44 -08:00
Jim Miller
5437c220e2 am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
  Fix 4560303: Add setting to lock later when power button pressed
2012-01-10 10:34:51 -08:00
Jim Miller
62fad76895 Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 2012-01-10 10:28:21 -08:00
Jim Miller
a4edd151c5 Fix 4560303: Add setting to lock later when power button pressed
This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

For the case of a secure device (user has a pin/password/pattern),
this will lock the device immediately or not based on the setting.

For the non-secure case, this always "locks" the device to provide easy
access to the camera while preventing unwanted input.

Change-Id: Ie328485c3f7559e26896d761cbf0e69d3f4df4e2
2012-01-09 17:30:58 -08:00
Dianne Hackborn
32313b161f am d476c8b8: am d3be0a76: Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1
* commit 'd476c8b8a8a6fadea7e72426d3e93c4e6b00e543':
  Unhide Resources APIs for getting resources at specific densities.
2012-01-09 16:51:52 -08:00
Dianne Hackborn
d3be0a76e4 Merge "Unhide Resources APIs for getting resources at specific densities." into ics-mr1 2012-01-09 16:47:35 -08:00
Mangesh Ghiware
2ddb4c8509 Merge "Fix issue with site-specific display density getting stuck." 2012-01-09 16:02:21 -08:00
Adam Powell
45b075dd5c Fix a bug where window progress bars had the wrong default visibility
on windows with action bars.

Change-Id: I5509d9a7c5f029b0471bd63e781f4756f5a319bc
2012-01-09 15:41:40 -08:00
Mangesh Ghiware
6f2db8e755 Fix issue with site-specific display density getting stuck.
This issue was found while investigating b/5328288.

After navigating to a page that specifies target-densitydpi in the
viewport meta tag, this density value wasn't reset to the default value
for a page that didn't.

Change-Id: I1a66dab769026367224ecf4cc28bc033ee97e475
2012-01-09 13:53:01 -08:00
Elliott Hughes
64140a0770 Fix Music import for Turkish locales.
For non-localized strings like the keywords in SQL statements, we shouldn't use
locale-specific case transformations.

(Cherry pick of 03f8f84c345e7c861a6de889d434b9d82cf04c8d.)

Bug: 4284951
Change-Id: If5b7154f70a7db22837d071d1c57e929729b7d35
2012-01-09 13:36:36 -08:00
Dianne Hackborn
613989772f Unhide Resources APIs for getting resources at specific densities.
This adds Resources.getDrawableForDensity() and
Resources.getValueForDensity().  These are needed for applications
to correctly retrieve larger icons such as in launcher when
running on a tablet.  We had already exposed the APIs to tell the
application which density to use for app icons on the current
device, but didn't unhide these APIs that allowed you to
actually retrieve them.

This is safe to do without introducing a new API level (as long
as we do it soon) because we know these APIs already exist in
Android 4.0, and there is no reason for anyone to be removing
them when building a device.

Change-Id: I5138e5dc908197b66a98d20af73c5374cb5d41d3
2012-01-09 12:00:30 -08:00
Fabrice Di Meglio
7d5178e9fb Merge "Add textDirection="locale"" 2012-01-09 10:46:03 -08:00
Ben Murdoch
3d00578529 Merge "Prompt the user to terminate unresponsive pages." 2012-01-09 10:41:45 -08:00
George Mount
c0c3025cf2 Fix delete key with ContentEditable fields.
Bug 5806859
 Bug 5795341
 Add a custom InputConnection to capture the deleteSurroundingText
 command and use it to send delete key codes to the WebView for
 single deletes or calling into WebViewCore to delete contents for
 more complex changes.
 Also makes the IME options "normal text" for webkit-based text
 entry.
 Webkit change: Ic938d6fa

Change-Id: I18606014a034194928a61981dc3e2400a7db5fac
2012-01-09 09:19:29 -08:00
Ben Murdoch
e2e2083583 Prompt the user to terminate unresponsive pages.
Run a background "watchdog" thread that will check for
the WebCore thread stopping processing messages (this
can happen if a piece of JavaScript goes into an infinite
loop, for example) and offer to close the WebView app when
it detects such a case, much like the normal system ANR.

Bug: 2563868
Change-Id: Ic74813b1e630d657c340a7017a4b0814071eb041
2012-01-09 17:00:09 +00:00
Narayan Kamath
c60aad2a8a Write unit tests for android.speech.tts.
Change-Id: Ie5b3b4cdd13be2babee9a44bae00da179b372d12
2012-01-09 13:38:55 +00:00
Romain Guy
bc5d876df0 Avoid allocating when performing the measure/layout passes
Change-Id: I94faa9167d632ff5a1d05f795a2c4dcc0f02348c
2012-01-06 18:06:58 -08:00
Marco Nelissen
2ef4b6630b Merge "New UX calls for dialogs without titles." 2012-01-06 16:40:02 -08:00
John Reck
1986ed76d2 Merge "Update WebSettings.PREVIOUS_VERSION" 2012-01-06 16:03:59 -08:00
Eino-Ville Talvala
143c7c8854 am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
2012-01-06 15:51:44 -08:00
Eino-Ville Talvala
7944704e6c Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 2012-01-06 15:46:36 -08:00
Marco Nelissen
9cd7bde1ff New UX calls for dialogs without titles.
b/5753055

Change-Id: I86ba0f937f71db56b3ea77752b2b30929b791a04
2012-01-06 15:42:02 -08:00
George Mount
5755d01d2c Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI." 2012-01-06 14:00:30 -08:00
George Mount
427f2e5ac5 Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.
Bug 5827817
 Added a nativeClass parameter to all appropriate JNI methods
 and used it instead of GET_NATIVE_VIEW to reduce JNI overhead.

 Webkit Change: I02004fe1

Change-Id: I49c7ecfd598826ffe78067aab393a24860ce10ef
2012-01-06 13:58:27 -08:00
Fabrice Di Meglio
4c1e00a8c2 Add textDirection="locale"
- also fix and update unit tests
- see bug #5242821

Change-Id: I29e029bab8ade336a430f9a2a5073caaf11b8dda
2012-01-06 11:29:18 -08:00
Eino-Ville Talvala
b7feb1c91f Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.

Bug: 5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
2012-01-06 10:24:01 -08:00
George Mount
d88f26e3aa Merge "Clean up code using eclipse's automatic cleanup feature." 2012-01-06 09:53:01 -08:00
Jonathan Dixon
5883520fd7 Merge "Make WebView.HitTestResult static" 2012-01-06 02:19:31 -08:00
Ken Wakasa
c42e6a0bed Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
3dc5a2eacf Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Ken Wakasa
9a74476c0a Comment clean up for InputMethodSubtype.
Change-Id: I50bca715f4caa669cb341b36a3d46358e1ad1ded
2012-01-06 12:32:15 +09:00
Teng-Hui Zhu
149537cb70 getDuration can be only called after prepared. DO NOT MERGE
bug:5816130
Change-Id: Ia740a1a4da7f321356f24c35067f9499955289a9
2012-01-05 15:15:47 -08:00
George Mount
fab67a1532 Clean up code using eclipse's automatic cleanup feature.
Bug 5826249

Change-Id: Iacd233625e144cdc522644aafee424aabd6a7f5d
2012-01-05 15:08:27 -08:00
Teng-Hui Zhu
a4ad2928eb Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
John Reck
777710e504 Update WebSettings.PREVIOUS_VERSION
Bug: 5825937

Change-Id: Idb0982e13ad6790ca71b16ff322864fca135f14e
2012-01-05 11:20:04 -08:00
Rajdeep Dua
cf06d7390c Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType)
Bug Id : 5813366

Change-Id: Icc482ad820a91a1896c61db67bb6b95cc2ae4c5b
2012-01-05 16:27:15 +05:30
Wink Saville
9a03482c66 am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
  Enhancement on ICS data stall polling logic
2012-01-04 21:52:13 -08:00
Teng-Hui Zhu
0d1d30b330 getDuration can be only called after prepared.
bug:5816130
Change-Id: I4f264ef612995bc4f7bc3e378893ed9491423fdc
2012-01-04 17:28:58 -08:00
Wink Saville
c697ebfdd6 Merge "Enhancement on ICS data stall polling logic" into ics-mr1 2012-01-04 13:53:25 -08:00
Kazuhiro Ondo
7efb89b955 Enhancement on ICS data stall polling logic
Put enhancements on data stall polling logic in ICS so that
stall recovery can kick in earler while screen is on.

Bug: 5767897
Change-Id: I4683fc45c0161f4374749c8e5840261c19a48f77
2012-01-04 11:09:51 -08:00
John Reck
430b1b9b3c Fix Apache stack
Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
2012-01-04 09:49:17 -08:00
Jesse Wilson
7c48707a9d Merge "Explicitly specify 'milliseconds' as alarm manager's time unit." 2012-01-04 08:22:36 -08:00
Ben Murdoch
b2c63abcdc Do not allow file:// access when it is disabled. Do not merge.
Cherry pick of If2793f31cb37e0d3af15cb18e818bfa4058167fd

If WebSettings is configured to disallow access to file://
URLs, then block them.

Bug: 5773763
Change-Id: I0ab84cde90c955d31077329fddebc25978287c64
2012-01-04 15:08:07 +00:00
Steve Block
7b061309fa Merge "Fix AppCache when either no path or an invalid path is supplied" 2012-01-04 05:36:57 -08:00
Elliott Hughes
6746499f12 Fix Music import for Turkish locales.
For non-localized strings like the keywords in SQL statements, we shouldn't use
locale-specific case transformations.

(Cherry pick of 03f8f84c345e7c861a6de889d434b9d82cf04c8d.)

Bug: 4284951
Change-Id: Ib5180daf7892af7b645c906fdfeacf9da87bd667
2012-01-03 17:20:38 -08:00
Danielle Millett
3c673732ea Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock" 2012-01-03 13:44:28 -08:00
Ben Murdoch
2853041e6a Merge "Do not allow file:// access when it is disabled." 2012-01-03 02:53:58 -08:00
Jesse Wilson
52cd299eef Move the frameworks/base hostname verifier into libcore. Part 2/2
Bug: http://b/5619726
Change-Id: I165eb3befcef104ff56ffb466c87c60b632f3194
2011-12-27 19:00:56 -05:00