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
Bart Sears
a476eed6b2
Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
2012-01-06 15:45:13 -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
Fabrice Di Meglio
c1d03cff27
Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
2012-01-06 14:19:20 -08:00
Justin Ho
fe3eb938ca
am 7db47a42: am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
...
* commit '7db47a42f1211befb015a7a9640f0c447b477228':
Updating default image wallpaper for tablet.
2012-01-06 14:13:38 -08:00
Justin Ho
3116b7a7ca
Merge "Updating default image wallpaper for tablet." into ics-mr1
2012-01-06 14:07:37 -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
Steve Block
f4c2294b01
Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE"
2012-01-06 10:30:56 -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
Steve Block
8564c8da81
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
2012-01-06 10:07:54 +00: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
Fabrice Di Meglio
d4a69b4a1c
Merge "Fix bug #5753006 Garbled Labels in Maps"
2012-01-05 15:18:52 -08: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
Fabrice Di Meglio
a0a117b4c1
Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
...
- do not clear the smart pointer when the cache entry does not fit the cache size
See http://code.google.com/p/android/issues/detail?id=23337
Change-Id: Id4533d9f8a396c310c9215157ec5a4c07f30c7f2
2012-01-05 14:34:42 -08:00
Steve Block
bd47cac4df
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
c726ff02c7
Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long"
2012-01-05 13:55:01 -08:00
Fabrice Di Meglio
c511bee87c
Fix bug #5753006 Garbled Labels in Maps
...
- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class
Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
2012-01-05 13:30:54 -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
Fabrice Di Meglio
bd7cdc32eb
Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long
...
- do not clear the smart pointer when the cache entry does not fit the cache size
Change-Id: I49f1aa1e70018bb7d6a8fb076d9269d0ec6a5d98
See: http://code.google.com/p/android/issues/detail?id=23337
2012-01-04 14:25:54 -08:00
Wink Saville
c697ebfdd6
Merge "Enhancement on ICS data stall polling logic" into ics-mr1
2012-01-04 13:53:25 -08:00
Steve Block
6215d3ff4b
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
2012-01-04 20:05:49 +00: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
c9c76a82c6
Merge "Fix Apache stack"
2012-01-04 10:52:35 -08:00
Steve Block
41891aeaf4
Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE"
2012-01-04 10:13:13 -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
Steve Block
5baa3a62a9
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
2012-01-03 22:38:27 +00:00
Winson Chung
f4a014e335
Updating default image wallpaper for tablet.
...
Change-Id: Ia4784cf05ccbf819d35adb494cd181850f6b7e11
2012-01-03 14:00:08 -08:00
Danielle Millett
3c673732ea
Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock"
2012-01-03 13:44:28 -08:00
Brian Colonna
dd13756fdc
Merge "Added padding to PIN layout status and carrier text"
2012-01-03 13:43:07 -08:00
Ben Murdoch
2853041e6a
Merge "Do not allow file:// access when it is disabled."
2012-01-03 02:53:58 -08:00
Eric Fischer
40da0486f8
Merge "Import revised translations."
2011-12-29 14:46:50 -08:00
Eric Fischer
6f32f87717
Import revised translations.
...
Change-Id: Idaec3a909e2edb46d7f3409947c8329210befcae
2011-12-29 11:46:43 -08:00