Commit Graph

12398 Commits

Author SHA1 Message Date
Ken Shirriff
d93cef9a3f Merge "Make ACCOUNT_NAME/ACCOUNT_TYPE consistent." 2010-02-05 12:45:15 -08:00
Chris Tate
ff8b1596d6 Merge "Don't hold the backup queue lock across a backup operation" 2010-02-05 12:38:51 -08:00
Mike Lockwood
f877076a1b Merge "Keep automatic screen brightness monotonically increasing until screen is turned off." 2010-02-05 12:38:02 -08:00
James Dong
85fa67e11c Merge "When the extractor is not able to be created successfully, don't crash" 2010-02-05 12:05:42 -08:00
Bjorn Bringert
6ad61d9a76 Merge "Adding speech recognition service public API" 2010-02-05 06:25:45 -08:00
Doug Zongker
52a0bb3857 Merge "rename encodeString to encodeToString" 2010-02-05 05:44:17 -08:00
Dan Egnor
8e83db5f24 Merge "Add ability to parse HTTP-format moratorium times (since pretty much every user wants this)." 2010-02-04 19:48:52 -08:00
James Dong
cea135806a Merge "Camcorder profile Java API support - Use Enum for Quality instead of int - Use static values() method from Enum, rather than if-else" 2010-02-04 17:50:05 -08:00
Doug Zongker
f9d3196cc8 rename encodeString to encodeToString
Change-Id: I777530b80a9e8be8c487e140574621cd9d35dc35
2010-02-04 17:07:59 -08:00
Dianne Hackborn
b01aa19ff7 Merge "Rename ApplicationContext to ContextImpl." 2010-02-04 16:53:47 -08:00
Doug Zongker
754a2abbb7 Merge "a new java implementation of base64 for android-common" 2010-02-04 16:51:10 -08:00
Chris Tate
900f7e4e2a Merge "Add single-package restore from an app's most-recent data" 2010-02-04 16:27:42 -08:00
Daniel Sandler
2f3d86f7b1 Merge "Add support in StatusBarManager for disabling ticker text." 2010-02-04 15:58:18 -08:00
Doug Zongker
b7cc1ec723 a new java implementation of base64 for android-common
A new Base64 encoder/decoder class.  Some benchmarks comparing the
decoder it to those from android.os.Base64Utils (a decode-only native
implementation not accessible to apps) and
org.apache.commons.codec.binary.Base64, all with the JIT enabled:

  1k encoded data
  APACHE   avg:   811 us    min:   244 us    max: 13671 us
  COMMON   avg:   263 us    min:    30 us    max:  4730 us
  NATIVE   avg:   102 us    min:    61 us    max:  5493 us

  10k encoded data
  APACHE   avg:  3624 us    min:  2746 us    max: 23895 us
  COMMON   avg:   979 us    min:   518 us    max:  7751 us
  NATIVE   avg:   817 us    min:   762 us    max:  3143 us

  100k encoded data
  APACHE   avg: 33167 us    min: 31829 us    max: 140411 us
  COMMON   avg:  6047 us    min:  5493 us    max: 45227 us
  NATIVE   avg: 10109 us    min: 10009 us    max: 12451 us

Change-Id: Ic622e3a967a62d57d30bd25b80cbe4e0dd60e764
2010-02-04 15:54:00 -08:00
Dima Zavin
feddcc3e9e Merge "Move the NDK graphics wrapper (libjnigraphics) to frameworks/base/native" 2010-02-04 15:40:39 -08:00
Mathias Agopian
da3b299dd3 Merge "fix [2313526] sensor enable race condition" 2010-02-04 15:26:27 -08:00
Michael Chan
8ae68fd576 Merge "Unhiding Rfc822Tokenizer.tokenize(CharSequence text, Collection<Rfc822Token> out)" 2010-02-04 14:59:31 -08:00
Suchi Amalapurapu
c9edfe9fa9 Merge "Some tests for install and replace package." 2010-02-04 14:59:00 -08:00
Kenny Root
2e48508eb6 Merge "resolved conflicts for merge of dd24f599 to master" 2010-02-04 14:26:40 -08:00
Kenny Root
e416a03177 resolved conflicts for merge of dd24f599 to master
Change-Id: I57c349c493d69585d4c85e8c0970649708c6bd33
2010-02-04 14:23:39 -08:00
Dianne Hackborn
6b578cba39 Merge "Framework part of issue #2391576: Add method to start the Jit and call it" 2010-02-04 12:48:12 -08:00
Bjorn Bringert
e3512d0c66 Merge "Remove source selector from SearchDialog" 2010-02-04 12:28:48 -08:00
Andreas Huber
5dbafdf5d0 Merge "Stop using the PV software decoders and use ours (based on PV code) instead even in non-FULL_STAGEFRIGHT builds." 2010-02-04 10:59:08 -08:00
Daniel Sandler
e925889974 Merge "Stop scaring the kids when USB is connected." 2010-02-04 10:44:50 -08:00
Ben Murdoch
9abfba76b8 Merge "When a window is closed, destroy the WebView properly so that WebCore is informed of it's destruction." 2010-02-04 09:54:26 -08:00
Grace Kloba
9e512bfdb7 Merge "Enable StreamLoader to be loaded in a separate thread." 2010-02-04 09:47:57 -08:00
Eric Laurent
df7b593133 am aead64de: Fix issue: 2413494: [Passion-c] Add TTY support.
Merge commit 'aead64def1fe58c95c086a0ca00cf0b13fa32ef1' into eclair-plus-aosp

* commit 'aead64def1fe58c95c086a0ca00cf0b13fa32ef1':
  Fix issue: 2413494: [Passion-c] Add TTY support.
2010-02-04 09:34:34 -08:00
Katie McCormick
a7735d8cbc am b5c01b96: am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
Merge commit 'b5c01b96a8e1780d8ac0638041b08e06b8c88a83'

* commit 'b5c01b96a8e1780d8ac0638041b08e06b8c88a83':
  SDK doc change: Fixed typo--fingure->finger
2010-02-03 20:27:42 -08:00
Joe Onorato
546b068cb9 Merge "Fix 1667521 - system process crash after bad notification" 2010-02-03 20:25:43 -08:00
Katie McCormick
4376a0cafc am 8a6c0607: Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair
Merge commit '8a6c060719c8870f370b82faa48ae2f437915214' into eclair-plus-aosp

* commit '8a6c060719c8870f370b82faa48ae2f437915214':
  SDK doc change: Fixed typo--fingure->finger
2010-02-03 20:21:26 -08:00
Dan Egnor
d11052311f Add ability to parse HTTP-format moratorium times
(since pretty much every user wants this).
2010-02-03 18:28:08 -08:00
Dianne Hackborn
12632744a5 Merge "Implement system data migration support." 2010-02-03 18:18:56 -08:00
Adam Powell
91a857b520 Merge "Fixed an overscrolling bug in AbsListView with a root in OverScroller." 2010-02-03 17:05:53 -08:00
Katie McCormick
6225fcd804 Merge "SDK doc change: Fixed typo--fingure->finger Bug: 1993220" into eclair 2010-02-03 16:52:18 -08:00
Andreas Huber
b67d3d800a Merge "Defer creating the video renderer until we see the first video frame." 2010-02-03 16:45:57 -08:00
Scott Main
1528c1677f Merge "Merge commit '2f7b69aa' into manualmerge" 2010-02-03 16:39:26 -08:00
Eric Fischer
17fb4b24d4 Merge "Fix Czech lock screen date format." 2010-02-03 16:38:49 -08:00
Scott Main
38c66659eb Merge commit '2f7b69aa' into manualmerge
Conflicts:
	docs/html/guide/topics/ui/themes.jd
2010-02-03 16:37:03 -08:00
Scott Main
3ef51c88b6 am 98a9fc0a: Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair
Merge commit '98a9fc0a0025a3df7b36f7752fc330eba8810603' into eclair-plus-aosp

* commit '98a9fc0a0025a3df7b36f7752fc330eba8810603':
  docs: revise the Style and Themes document to improve the
2010-02-03 16:18:17 -08:00
Scott Main
957a1a2571 Merge "docs: revise the Style and Themes document to improve the clarity of the concepts and expand the available information" into eclair 2010-02-03 16:11:41 -08:00
Andreas Huber
bc54f47081 Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions." 2010-02-03 15:41:23 -08:00
Chris Tate
bdcab6db9f Merge "Add auto-restore setting and Backup Manager awareness thereof" 2010-02-03 15:35:28 -08:00
Doug Zongker
d2a670d5a4 Merge "remove android.webkit.HttpDateTime, again" 2010-02-03 15:15:02 -08:00
San Mehat
e9bcf84a07 Merge "NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response" 2010-02-03 15:09:53 -08:00
Doug Zongker
7c482454b1 Merge "undo "move HttpDateTime from android.webkit to android-common jar"" 2010-02-03 12:57:54 -08:00
Bjorn Bringert
c8a2564170 Merge "Copy ic_menu_search.png to ic_search_category_default.png" 2010-02-03 12:52:21 -08:00
Daisuke Miyakawa
134bc70621 Merge "Honor '+' in phone export in vCard." 2010-02-03 12:44:39 -08:00
Megha Joshi
befcc6d32e am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0'

* commit 'b299f802b2dea19b003a6724d53ecff1b763bab0':
  Screenshots for sample syncadapter.
2010-02-03 12:34:53 -08:00
Megha Joshi
439270f03e am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp

* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
  Screenshots for sample syncadapter.
2010-02-03 12:29:19 -08:00
Megha Joshi
277345ae33 Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00