28713 Commits

Author SHA1 Message Date
Mathias Agopian
46beb43357 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
2010-10-21 16:26:02 -07:00
Kenny Root
d7cd560af5 am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES
Merge commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp

* commit '1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
  Use correct size of GAMEPAD_KEYCODES
2010-10-21 16:22:58 -07:00
Mathias Agopian
0c63605535 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Kenny Root
1d79a9d9f8 Use correct size of GAMEPAD_KEYCODES
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.

Bug: 3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
2010-10-21 15:46:03 -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
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
John Huang
7dc08fb070 Merge "Fix connect duration for un-established SIP calls." into gingerbread 2010-10-21 10:46:17 -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
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
Hung-ying Tyan
5d9e3bbb9d Fix connect duration for un-established SIP calls.
Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
2010-10-21 15:54:46 +08:00
James Dong
8ad6335d2c am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp

* commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
  File writer size estimation improvement
2010-10-20 21:28:38 -07:00
Mathias Agopian
63ac8f5377 am 2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Merge commit '2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp

* commit '2b2da52608303b149d22418865e67c8030c70e73':
  Add a test application to dump all the EGLConfig available
2010-10-20 21:28:34 -07:00
Mathias Agopian
4ceee5a6b0 am 73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Merge commit '73655bd2d303f8b3fe5c4bb0d8e4824361647381' into gingerbread-plus-aosp

* commit '73655bd2d303f8b3fe5c4bb0d8e4824361647381':
  propagate RS context priority to EGLContext when possible. DO NOT MERGE.
2010-10-20 21:28:29 -07:00
Mathias Agopian
fb31036fd8 am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit '583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp

* commit '583fefc8dcadecc7fc933513d3569dd9c16c100c':
  Use the context_priority extension when present.
2010-10-20 21:28:25 -07:00
James Dong
fa7a87fb4b Merge "File writer size estimation improvement" into gingerbread 2010-10-20 20:07:57 -07:00
Mathias Agopian
2b2da52608 Merge "Add a test application to dump all the EGLConfig available" into gingerbread 2010-10-20 20:05:28 -07:00
Mathias Agopian
73655bd2d3 Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread 2010-10-20 20:04:52 -07:00
Mathias Agopian
583fefc8dc Merge "Use the context_priority extension when present." into gingerbread 2010-10-20 20:04:46 -07:00
Mathias Agopian
6d90e89afa am a0795fc9: Merge "software renderer: fix [3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread
Merge commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72' into gingerbread-plus-aosp

* commit 'a0795fc9bdf97703780cbf0ec47c06eccb642e72':
  software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
2010-10-20 18:22:17 -07:00
Jean-Baptiste Queru
843ff92bb0 resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
2010-10-20 18:16:57 -07:00
Mathias Agopian
a0795fc9bd Merge "software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread 2010-10-20 18:00:43 -07:00
Mathias Agopian
c9923876d4 software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
2010-10-20 17:21:43 -07:00
Dianne Hackborn
674b856c15 am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.
2010-10-20 17:14:59 -07:00
Dianne Hackborn
fb2cd0aa9d Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -07:00
Mathias Agopian
cd1e02d460 Add a test application to dump all the EGLConfig available
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
2010-10-20 17:10:47 -07:00
Jean-Baptiste Queru
5d919b4387 Merge "Make disabled TextViews uneditable" 2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
c20f205d10 am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp

* commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
  BatteryService: Set bool to true if sysfs entry is not 0
2010-10-20 16:45:50 -07:00
Jean-Baptiste Queru
5bfef1ba05 Merge "BatteryService: Set bool to true if sysfs entry is not 0" 2010-10-20 16:35:17 -07:00
Jean-Baptiste Queru
eceace47c5 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 '81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp

* commit '81925e665c1e25d04cbc10e7333e793416bdc98f':
  Fix FastScroller overlay position bug
2010-10-20 16:33:51 -07:00
Jean-Baptiste Queru
81925e665c Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 2010-10-20 16:29:15 -07:00
Dianne Hackborn
eddfc04a08 Fix java doc on FLAG_EXTERNAL.
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
2010-10-20 16:03:37 -07:00
Kenny Root
c925944733 am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
Merge commit 'ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp

* commit 'ddf8fe505636d3b4435cb9952266765aab20b86d':
  Fix isUsbMassStorageConnected() will always return true
2010-10-20 14:13:21 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
2010-10-20 14:10:29 -07:00
Kenny Root
ddf8fe5056 Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 2010-10-20 14:10:00 -07:00
Dianne Hackborn
e9e2340583 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00
Justin Ho
a747b43993 am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp

* commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
2010-10-20 14:04:00 -07:00
Hung-ying Tyan
bdc15d8b43 am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Merge commit '4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp

* commit '4056ab97be6224dcc00ac70843544790f2d65fb7':
  Add permission requirements to SipAudioCall and SipManager javadoc.
2010-10-20 14:03:54 -07:00
Hung-ying Tyan
940b4d1c45 am 6037a056: Fix n-way conf call in SipPhone.
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.
2010-10-20 14:03:43 -07:00
Jeff Hamilton
e55806a555 am 23392a84: Fix the build.
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
  Fix the build.
2010-10-20 13:57:26 -07:00