23353 Commits

Author SHA1 Message Date
Nicolas Roard
4b71913ea7 Add the HTML5Audio class, to support the audio tag.
The corresponding webkit C++ CL is https://android-git.corp.google.com/g/#change,41405

Change-Id: Ia4169c353cde8cd8ee5786b874ff466897e3553e
2010-05-07 12:01:43 -07:00
Brian Carlstrom
763e3b675c am 1db4264c: am a0a126a0: am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl 2010-05-07 10:53:18 -07:00
Brian Carlstrom
1db4264c30 am a0a126a0: am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl 2010-05-07 10:26:46 -07:00
Brian Carlstrom
a0a126a060 am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken

* commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc':
  Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
2010-05-07 10:25:41 -07:00
Brian Carlstrom
e34d31e690 am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp

* commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
  Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
2010-05-07 10:23:34 -07:00
Brian Carlstrom
e616553ebc Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Part of fixing b/2663512: "java.io.IOException: SSL shutdown failed.: Ok" shouldn't dump a stacktrace

Change-Id: Ic6070ab9abb58c08eb7c5d8648424f582bb48e1c
2010-05-07 10:13:36 -07:00
Joe Malin
beddec7030 am 57253237: am 4405a0fe: am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample. 2010-05-07 09:01:51 -07:00
Joe Malin
5725323747 am 4405a0fe: am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample. 2010-05-07 09:00:20 -07:00
Joe Malin
4405a0fefb am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '9609cdc8522414b61ffb7d31b4ceb2007f205129' into kraken

* commit '9609cdc8522414b61ffb7d31b4ceb2007f205129':
  Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 08:58:42 -07:00
Joe Malin
9609cdc852 am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Merge commit 'e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp

* commit 'e50b940f153070a631a6c0d426cb7f3207042659':
  Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
2010-05-07 08:54:53 -07:00
Joe Malin
e50b940f15 Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Change-Id: Id2525470127a6324c361d952f09afec7dd584704
2010-05-07 08:37:23 -07:00
Leon Scroggins
7550a9580a Merge "Fix selection off-by-one bug." 2010-05-07 06:14:19 -07:00
Leon Scroggins
6a367f5cb0 Provide a getter to tell the index of the current found match.
Part of fix for bug 2663680

Requires a change to external/webkit.

Change-Id: I1279963cf219eb365dd72262710f87c83acd8c4d
2010-05-07 09:11:09 -04:00
Bjorn Bringert
78531d1b34 am c688d336: am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:47:35 -07:00
Bjorn Bringert
c688d336df am 74612539: am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:45:24 -07:00
Bjorn Bringert
74612539d2 am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken

* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:43:48 -07:00
Bjorn Bringert
c8170ee205 am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp

* commit '75370e74629b4938c4472d6001eebf5e305dbc55':
  Fixing: RecognitionService logcat spam "cancel called..."
2010-05-07 03:40:31 -07:00
Bjorn Bringert
75370e7462 Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 2010-05-07 03:37:48 -07:00
Shimeng (Simon) Wang
d3b562ad87 Merge "Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt"" 2010-05-06 20:49:12 -07:00
Shimeng (Simon) Wang
7274c7ebb8 Merge "Revert "Update api/current.xml after URL pattern update."" 2010-05-06 20:48:30 -07:00
Shimeng (Simon) Wang
cbeaf2d0ae Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt"
This reverts commit 63b849ef8d6a47422b0f2779f1d9320f6a65d16b.
2010-05-06 20:45:55 -07:00
Shimeng (Simon) Wang
325978154e Revert "Update api/current.xml after URL pattern update."
This reverts commit 81950cd2605224823011d4764438935139804b89.

Change-Id: Ibe3f1e46d99b87cfe1cbd896a2e62cd626e73b21
2010-05-06 20:42:49 -07:00
Romain Guy
6430c943f9 Set a layered drawable's child callback to be the container.
Change-Id: I959ad03883931d727d464f384073926e8fa9e2d2
2010-05-06 18:07:40 -07:00
Romain Guy
026ed0f93d Merge "Make sure that a drawable replacing a layer in a LayerDrawable gets a callback." 2010-05-06 17:59:22 -07:00
Romain Guy
79a63f7ddb Make sure that a drawable replacing a layer in a LayerDrawable gets a callback.
Change-Id: Iefac7d280b3c16e05f45688da655e17e21a3098b
2010-05-06 17:58:17 -07:00
Dan Egnor
f486ccb7ad am 92f6eda5: am a269d195: am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo 2010-05-06 17:38:58 -07:00
Dan Egnor
92f6eda5ec am a269d195: am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo 2010-05-06 17:36:42 -07:00
Dan Egnor
a269d195d4 am ca48c88c: am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit 'ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f' into kraken

* commit 'ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f':
  Make static versions of libutils and libbinder.
2010-05-06 17:35:06 -07:00
Dan Egnor
ca48c88c3d am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp

* commit '8a8658a5de261c2da72d431940877bd054bc9837':
  Make static versions of libutils and libbinder.
2010-05-06 17:33:45 -07:00
Daniel Sandler
5d66dd462c am da523303: am 94886d97: am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 2010-05-06 17:33:06 -07:00
Daniel Sandler
da52330384 am 94886d97: am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 2010-05-06 17:31:49 -07:00
Dan Egnor
8a8658a5de Merge "Make static versions of libutils and libbinder." into froyo 2010-05-06 17:31:48 -07:00
Daniel Sandler
94886d9774 am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd' into kraken

* commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd':
  Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:29:53 -07:00
Daniel Sandler
ad2f9ff786 am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp

* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
  Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:24:22 -07:00
Daniel Sandler
08e1b94c5c Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 2010-05-06 17:23:03 -07:00
Robert Greenwalt
e491bd6f65 am 7c258c81: am caa63341: am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo 2010-05-06 17:20:36 -07:00
Robert Greenwalt
7c258c81ca am caa63341: am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo 2010-05-06 17:19:03 -07:00
Robert Greenwalt
caa63341a8 am d6d11517: am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5' into kraken

* commit 'd6d115173a856fe28cf5a3087f6d7b0de77495c5':
  Fix ThrottleService wifi interaction
2010-05-06 17:17:51 -07:00
Doug Felt
0b9d2ca6b6 Fix selection off-by-one bug.
The wrong value was used to measure the width of unidirectional text.

Change-Id: I57752c111641ca1cc951e0647b60c79f5a9493ad
2010-05-06 17:16:31 -07:00
Robert Greenwalt
d6d115173a am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp

* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
  Fix ThrottleService wifi interaction
2010-05-06 17:16:04 -07:00
Kenny Root
18b3cad7cf am 33ff6cdb: am b658cc42: Merge "Prevent local reference table overflows" into kraken 2010-05-06 17:15:48 -07:00
Robert Greenwalt
f9dc24de53 Merge "Fix ThrottleService wifi interaction" into froyo 2010-05-06 17:14:23 -07:00
Kenny Root
33ff6cdb1b am b658cc42: Merge "Prevent local reference table overflows" into kraken 2010-05-06 17:14:13 -07:00
Kenny Root
b658cc42aa Merge "Prevent local reference table overflows" into kraken 2010-05-06 17:12:13 -07:00
Christopher Tate
10c40078d0 am 5cfec530: am fa9e7c05: Sketch of Native input for MessageQueue / Looper / ViewRoot 2010-05-06 17:10:40 -07:00
Jim Miller
2eebfe4117 am faa1461d: am ab4f3c60: Merge "Manual integration of I32a7b5 from froyo" into kraken 2010-05-06 17:10:35 -07:00
Xia Wang
ac18a05811 am 4b86be10: am 0bfc3973: am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo 2010-05-06 17:10:31 -07:00
Dan Morrill
6a34f3c585 am a371dfc5: am 9fd3a6be: am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo 2010-05-06 17:10:27 -07:00
Neal Nguyen
1acadbc69c am 529ad92e: am bda001aa: am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo 2010-05-06 17:10:22 -07:00
Christopher Tate
5cfec53064 am fa9e7c05: Sketch of Native input for MessageQueue / Looper / ViewRoot 2010-05-06 17:08:21 -07:00