34857 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
97a0aa987a am eceace47: am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
Merge commit 'eceace47c575d15a3d4b7cd511c20f86850bf301'

* commit 'eceace47c575d15a3d4b7cd511c20f86850bf301':
  Fix FastScroller overlay position bug
2010-10-21 13:46:24 -07:00
Kenny Root
fcf48955b8 am c9259447: am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
Merge commit 'c925944733207b83aaa81cf7a92c38eb48443470'

* commit 'c925944733207b83aaa81cf7a92c38eb48443470':
  Fix isUsbMassStorageConnected() will always return true
2010-10-21 13:44:55 -07:00
Dianne Hackborn
6dcab2099b am 153bf6c8: am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4'

* commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4':
  Fix issue #3113424: Battery stats don't reset on Crespo
2010-10-21 13:44:47 -07:00
Justin Ho
d829c4756c am a747b439: (-s ours) am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread
Merge commit 'a747b4399300beae712dacdf189f10e91b3623a0'

* commit 'a747b4399300beae712dacdf189f10e91b3623a0':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
2010-10-21 13:44:16 -07:00
Hung-ying Tyan
6d848f759e am bdc15d8b: am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Merge commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625'

* commit 'bdc15d8b43e7763bf72780d0f683b223b8cf6625':
  Add permission requirements to SipAudioCall and SipManager javadoc.
2010-10-21 13:44:06 -07:00
Hung-ying Tyan
2cef210f53 am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone.
Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'

* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
  Fix n-way conf call in SipPhone.
2010-10-21 13:43:43 -07:00
Daniel Lehmann
c2238d0062 Fix default style in constructor with only one parameter
Bug:3011901
Change-Id: I6c1b8663ccdfae36d2bb5e63fdc852b6391f3585
2010-10-21 13:37:32 -07:00
Dmitri Plotnikov
beb2178b49 Making multi-values extra in contact INSERT intent public.
Change-Id: I27da6278027a8b6a18b8dea756aa4ed8920ec748
2010-10-21 13:31:57 -07:00
Chet Haase
bdccfe4ac4 Merge "Optimizing display lists by referencing pointers to resources instead of copying them" 2010-10-21 13:29:26 -07:00
Marc Blank
299acb5812 Don't stop FlingRunnable when deltaY is rounded to zero
Change-Id: I6558d1b2e392c741108ca13da83351eadbce0824
2010-10-21 13:15:34 -07:00
Chia-chi Yeh
044fcd64fe am 703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Merge commit '703aae06c0925b19657877bb1872bb2f28874969' into gingerbread-plus-aosp

* commit '703aae06c0925b19657877bb1872bb2f28874969':
  RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
2010-10-21 12:57:03 -07:00
Chia-chi Yeh
703aae06c0 Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread 2010-10-21 12:53:37 -07:00
Chia-chi Yeh
8a68b52b98 RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
Rewrite using integer arithmetic to get full 32-bit precision instead
of 23-bit in single precision floating-points.

Bug: 3029745
Change-Id: If67dcc403923755f403d08bbafb41ebce26e4e8b
2010-10-22 03:47:02 +08:00
Joe Onorato
f3c3c4fd14 Refactor SystemUI so the status bar isn't a Service of its own.
There is now one SystemUIService, which starts the status bar service.
Pretty soon there will be other things running in here too.  This way
we don't need to have each of them started by something individually.

This also moves the choice between tablet and phone status bar into
SystemUI.apk, which seems like a much better place for it.

Change-Id: Ib69ef2f43d648764f8dbb52008f5d036a1ee07d9
2010-10-21 15:42:34 -04:00
Daniel Sandler
10e370c689 Merge "New system bar "shirt pocket", for quickly stashing draggable bits." 2010-10-21 12:24:12 -07:00
Chet Haase
5c13d89c13 Optimizing display lists by referencing pointers to resources instead of copying them
Change-Id: I81ad3551d74aa1e5bb64d69e33d2eb29a6c1eb6a
2010-10-21 12:02:42 -07:00
Joe Onorato
96cf6a403b Merge "Don't remove items from mRecords while iterating over it." 2010-10-21 12:00:33 -07:00
Daniel Sandler
524f568802 New system bar "shirt pocket", for quickly stashing draggable bits.
Anything that can be dragged using the new drag manager APIs
(View#startDrag) can be dropped here; the pocket will hold
it for you until you're ready to drag it out again.

Known issues:
 - currently discarding the clipping whenever you drag it
   out; in the future we will only discard it once you
   actually drag it somewhere
 - there's a bug where dragging things back out of the
   pocket's window requires an extra tap (i.e. tap once then
   tap and drag)
 - almost nothing uses the new drag manager yet :)

Change-Id: Iff3103e4117f31023e1e96667632d77912e21d30
2010-10-21 14:54:00 -04:00
Nick Kralevich
9a430d8c0e am 62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp

* commit '62d0970c82f9a2c17aea67379c207a3f17556c46':
  allow dumpstate to work for non-root users.
2010-10-21 11:50:55 -07:00
John Huang
33051ad178 am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp

* commit '7dc08fb070ff7455e794fc81645ccb4349cd152f':
  Fix connect duration for un-established SIP calls.
2010-10-21 11:46:55 -07:00
Nick Kralevich
62d0970c82 Merge "allow dumpstate to work for non-root users." into gingerbread 2010-10-21 11:35:49 -07:00
Gilles Debunne
83322fd4db Merge "Fix to display first tab as selected on tab widget creation." 2010-10-21 11:19:10 -07:00
Jeff Hamilton
6967f09604 am e55806a5: am 23392a84: Fix the build.
Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d'

* commit 'e55806a55561c992086ddff717aca27206fa0c5d':
  Fix the build.
2010-10-21 10:56:19 -07:00
Hung-ying Tyan
fbd21b5875 am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and...
Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
  Do another contact lookup if the first one fails and...
2010-10-21 10:56:11 -07:00
Hung-ying Tyan
821f087989 am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
  Silently reject a ringing call when another call is dialing/ringing.
2010-10-21 10:56:02 -07:00
Dianne Hackborn
b37cc33030 am b5018723: am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code
Merge commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe'

* commit 'b50187237c1bdbb805b67bbc35002b243b8a86fe':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
2010-10-21 10:55:52 -07:00
Hung-ying Tyan
164cd438fb am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
  Remove ringtone API from SipAudioCall.
2010-10-21 10:55:33 -07:00
Dirk Dougherty
4ef36afa32 am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'

* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
  Doc change: escape angle brackets in javadoc comment.
2010-10-21 10:55:21 -07:00
Hung-ying Tyan
4e00a8d582 am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
  Return display name in SipConnection.getCnapName().
2010-10-21 10:53:49 -07:00
Mathias Agopian
0d4e658bad am add9db83: am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
Merge commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5'

* commit 'add9db83fdbf939f0610f8b357788fd3e8ad9ab5':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
2010-10-21 10:47:32 -07:00
Mindy Pereira
9a9849ac7f am 62ad0db6: (-s ours) am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Merge commit '62ad0db62393073a8cda9b21e4ae1506954c10a5'

* commit '62ad0db62393073a8cda9b21e4ae1506954c10a5':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
2010-10-21 10:47:15 -07:00
John Huang
7dc08fb070 Merge "Fix connect duration for un-established SIP calls." into gingerbread 2010-10-21 10:46:17 -07:00
Joe Onorato
163d8d972b Don't remove items from mRecords while iterating over it.
This change also make removeList a member, because it's only
actually used in an error case (when the client process has
gone away).

Bug: 3118244
Bug: 3083062
Bug: 2876696
Bug: 2778958
Change-Id: I856118d8de4309cd63287d7c57cd938e1c35dab0
2010-10-21 13:32:49 -04:00
Scott Main
9c09ebd2b4 am b619e333: am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image
Merge commit 'b619e3332d36a8b5c56da6530834be8cc69272df'

* commit 'b619e3332d36a8b5c56da6530834be8cc69272df':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
2010-10-21 09:56:04 -07:00
Jean-Baptiste Queru
3317c6db00 am 2cead908: am db723ea0: Merge "jni: Remove duplicated jniThrowException()"
Merge commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102'

* commit '2cead908f4ff7692e46e20aa2a8c4c2f0c0a9102':
  jni: Remove duplicated jniThrowException()
2010-10-21 09:54:58 -07:00
Steve Block
1c9ca4f1fa Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/75473

Bug: 3086308
Change-Id: I01274b3b1384a6947d5a56a51b0b93b1898ddebc
2010-10-21 17:53:20 +01:00
Chung-yih Wang
16f5d6ee79 am aefcdde4: am 4944fdd7: Periodically scan wifi when wifi is not connected and wifi lock is grabbed in SipService.
Merge commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6'

* commit 'aefcdde4bdf2be74bdf9620359830faeed5419e6':
  Periodically scan wifi when wifi is not connected and wifi lock is
2010-10-21 09:51:01 -07:00
Hung-ying Tyan
9d6d17fcd8 am 35d9e770: am 0a6e717f: Handle dialing a SIP call to self.
Merge commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2'

* commit '35d9e7701eea343d8cdfcd3c990ae74685b299b2':
  Handle dialing a SIP call to self.
2010-10-21 09:50:50 -07:00
Brad Fitzpatrick
a294faffc9 am 6799864d: am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
Merge commit '6799864d6c9744e4c5133a90410576b577d65de6'

* commit '6799864d6c9744e4c5133a90410576b577d65de6':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
2010-10-21 09:47:27 -07:00
Sylvain Fonteneau
4fc9ecf223 am a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
Merge commit 'a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp

* commit 'a71354d76689802152c33af257092d639c03c421':
  Enable presence check at application level using
2010-10-21 09:38:49 -07:00
Nick Pelly
c0e93a849f am 7ea5c45e: NFC settings cleanup.
Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp

* commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
  NFC settings cleanup.
2010-10-21 09:38:15 -07:00
Nick Kralevich
77d87aa7ff allow dumpstate to work for non-root users.
Change-Id: Iaad4a097f5e09914842955dafbc0a09cc7a1db48
2010-10-21 09:14:14 -07:00
Brad Fitzpatrick
0c55136893 am 15358e14: Merge "Make the base direction of the Arabic error pages RTL"
Merge commit '15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp

* commit '15358e145622df90942a444a63ae0006713b636d':
  Make the base direction of the Arabic error pages RTL
2010-10-21 09:10:55 -07:00
Brad Fitzpatrick
ba1b1c9c22 am 6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
Merge commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp

* commit '6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
  Set the base direction of the Hebrew error pages to RTL
2010-10-21 09:10:47 -07:00
Joe Onorato
749984798c fix bad merge
Change-Id: I44b9265a7ef3accc5c794d2ef9308b050c961a81
2010-10-21 11:38:25 -04:00
Brad Fitzpatrick
385a753dea resolved conflicts for merge of 368fdba4 to master
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
2010-10-21 07:39:10 -07:00
Brad Fitzpatrick
15358e1456 Merge "Make the base direction of the Arabic error pages RTL" 2010-10-21 07:18:18 -07:00
Brad Fitzpatrick
6cf9c39452 Merge "Set the base direction of the Hebrew error pages to RTL" 2010-10-21 07:18:02 -07:00
Sylvain Fonteneau
a71354d766 Enable presence check at application level using
RawTagConnection.isConnected() method.

Also needs packages/apps/Nfc to be updated.

Change-Id: I726e88853e2c4b348f3b87b7574bc6eded7f5b7c
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-21 03:54:52 -07:00
Nick Pelly
7ea5c45e8d NFC settings cleanup.
Remove NFC settings from Settings.System. The NFC Service tracks them
internally using SharedPreference.

Revert back to enable()/disable()/isEnabled() - Tag discovery is the
only functionality NFC service performs right now so we don't need to
break it up more explicitly yet. enable/disable is the global NFC
on/off and later we'll add enableDiscovery(), enableTagEmulation(),
enableSecureElement() etc as needed.

Change-Id: Id5b23e89d4a29511835f509962842452075e56cb
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-21 03:54:51 -07:00