Eric Laurent
9bf75328d4
am 371ed722: am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '371ed72216789505acadfac3f2e905dafb04f6e0':
Update java doc for visualizer FFT capture.
2010-12-01 03:37:07 -08:00
Andreas Huber
e0f66ea189
am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-12-01 03:37:00 -08:00
Dirk Dougherty
4191ea8c1c
am fb9612ba: (-s ours) am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit 'fb9612ba98f29b794244323cab6f56204d072eeb':
Do not merge: Doc change: API diff report for gingerbread.
2010-12-01 03:35:02 -08:00
Dirk Dougherty
6ec8805d43
am ba5d11bd: (-s ours) am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit 'ba5d11bdba42ea1e38eb66a347c932ce6d0b8633':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-12-01 03:34:55 -08:00
Eric Fischer
02f1191c1f
am 30a0e0db: (-s ours) am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '30a0e0db71525948682eda574786fff3e77343b6':
Import revised translations. DO NOT MERGE
2010-12-01 03:34:48 -08:00
Wink Saville
6d97576b9b
am 2ebb3a2d: (-s ours) am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit '2ebb3a2d9b31213ced141c1807f60e13983f40dd':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-12-01 03:34:39 -08:00
Ben Murdoch
6a9fa5fa73
resolved conflicts for merge of d2607118 to master
...
Change-Id: Id6092a762af775e9b5db390feaba3e10bd98ef7c
2010-12-01 10:55:18 +00:00
Brian Carlstrom
d0654c56f9
Merge "Tracking merge of dalvik-dev to master"
2010-11-30 22:26:17 -08:00
Brad Fitzpatrick
cce33294ca
Merge "StrictMode: more accurate timings"
2010-11-30 21:41:12 -08:00
Jeff Brown
c082d985de
Merge "Fix documentation bug."
2010-11-30 19:53:42 -08:00
Chia-chi Yeh
dbd59a1df5
Merge "RTP: Prepare to unhide the APIs."
2010-11-30 19:45:47 -08:00
Jeff Brown
53c16642e2
Ensure the ShortcutManager uses the correct key character map.
...
The ShortcutManager used to only receive the key code of the key event
that triggered the shortcut. This change now provides the shortcut
manager with the whole key event so it can look up the associated
character using the correct key character map.
To make this more efficient, added a mechanism for recycling
key events. At the moment it is only used by key events owned by the
system process, since clients of the existing API (such as Views)
might continue to hold on to key events after dispatch has finished so
they would break if the key event were recycled by the framework.
Deprecated KeyCharacterMap.BUILT_IN_KEYBOARD.
Change-Id: I4313725dd63f2be01c350c005a41c7fde9bc67e8
2010-11-30 18:50:17 -08:00
Jeff Brown
6688837ff6
Support non-orientation aware keyboards and other devices.
...
Fixed a bug with dpad keys on external keyboards being rotated
according to the display orientation by adding a new input device
configuration property called "keyboard.orientationAware".
Added a mechanism for overriding the key layout and key character
map in the input device configuration file using the new
"keyboard.layout" and "keyboard.characterMap" properties.
Also added "trackball.orientationAware", "touch.orientationAware" and
"touch.deviceType" configuration properties.
Rewrote the configuration property reading code in native code
so that it can be used by EventHub and other components.
Added basic support for installable idc, kl, and kcm files
in /data/system/devices. However, there is no provision for
copying files there yet.
Disabled long-press character pickers on full keyboards so that
key repeating works as expected.
Change-Id: I1bd9f0c3d344421db444e7d271eb09bc8bab4791
2010-11-30 17:15:49 -08:00
Mike Lockwood
92da48787a
Merge "NotificationManagerService: minor cleanup"
2010-11-30 17:03:32 -08:00
Hung-ying Tyan
cf3a297bbb
am c41b27e2: am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread
...
* commit 'c41b27e2748ee19620636a14721a1dc14c3b418c':
Correct SipService.isOpened() implementation.
2010-11-30 16:24:15 -08:00
Hung-ying Tyan
3830cfb04a
am 5c85338d: am d9e12303: Merge "Notify SipSessions before closing SIP stack." into gingerbread
...
* commit '5c85338dcf85462534d85440ded100a8012ff9dd':
Notify SipSessions before closing SIP stack.
2010-11-30 16:24:05 -08:00
Hung-ying Tyan
fe443a97c4
am 0e58a952: am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
...
* commit '0e58a9529895e270dae90e69486a59e41de714b8':
Throw proper exceptions in SipManager
2010-11-30 16:23:54 -08:00
Chia-chi Yeh
7e65c1253a
am 4f93f08d: am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
...
* commit '4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
2010-11-30 16:23:40 -08:00
Irfan Sheriff
34b349f0c8
am ea6bb1b4: (-s ours) am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
...
* commit 'ea6bb1b4d7111dfd084f772f83094bda662fdb23':
DO NOT MERGE fix runstate race condition
2010-11-30 16:23:29 -08:00
Chia-chi Yeh
e2e7cf12b7
am e843dfa8: am bd399b0b: Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
...
* commit 'e843dfa8dcd0a7bfa956b75424bb5db834975a64':
RTP: Pause echo suppressor when far-end volume is low.
2010-11-30 16:23:17 -08:00
Mindy Pereira
06abc8a8cb
Merge "Preference changes to layouts."
2010-11-30 14:19:19 -08:00
Daniel Sandler
f8720fe1a8
Merge "Fix build."
2010-11-30 13:18:36 -08:00
Daniel Sandler
b2642cbb60
Merge "When updating notifications, always reuse the last row."
2010-11-30 12:48:31 -08:00
Eric Laurent
aaf4046203
am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
Update java doc for visualizer FFT capture.
2010-11-30 11:56:00 -08:00
Andreas Huber
fde5bc50f2
am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-11-30 11:53:01 -08:00
Eric Laurent
528648d56f
Merge "Update java doc for visualizer FFT capture." into gingerbread
2010-11-30 11:50:25 -08:00
Dirk Dougherty
915f0c59c7
am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit '04d2cc05a2a59bf61bead85d58bc4c186392d91d':
Do not merge: Doc change: API diff report for gingerbread.
2010-11-30 11:48:51 -08:00
Dirk Dougherty
e45fcf3c7a
am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit '50f8445edd14a21ad86080ff7b204eefdc2c62d5':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-11-30 11:48:46 -08:00
Eric Fischer
b192c271eb
am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
Import revised translations. DO NOT MERGE
2010-11-30 11:48:00 -08:00
Wink Saville
46abef4b46
am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Ben Murdoch
92a9946c6b
am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
...
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
Hide plugin views when we start playing HTML5 video
2010-11-30 11:46:24 -08:00
Hung-ying Tyan
0c35b2752f
am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread
...
* commit '349f3509f7335bbdef443a75afa36fb3c2d9552c':
Correct SipService.isOpened() implementation.
2010-11-30 11:46:15 -08:00
Hung-ying Tyan
620d026389
am d9e12303: Merge "Notify SipSessions before closing SIP stack." into gingerbread
...
* commit 'd9e12303d279654afe16319f948f93490cd1b4d5':
Notify SipSessions before closing SIP stack.
2010-11-30 11:46:08 -08:00
Hung-ying Tyan
003a6e8edc
am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
...
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
Throw proper exceptions in SipManager
2010-11-30 11:46:01 -08:00
Chia-chi Yeh
425027d179
am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
...
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
2010-11-30 11:45:54 -08:00
Irfan Sheriff
dc848fc447
am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
...
* commit 'ee93169ed1072d3be627601223dafbcc061e7568':
DO NOT MERGE fix runstate race condition
2010-11-30 11:45:45 -08:00
Chia-chi Yeh
93c691619b
am bd399b0b: Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
...
* commit 'bd399b0bd205a1a3889bae1a619c6d4d4a0f4816':
RTP: Pause echo suppressor when far-end volume is low.
2010-11-30 11:45:31 -08:00
Andreas Huber
7b3e445b94
Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
2010-11-30 11:42:22 -08:00
Dirk Dougherty
c17743c07e
Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
2010-11-30 11:27:15 -08:00
Justin Ho
6eb5b2af23
Merge "Adding new ringtones and notifications"
2010-11-30 11:05:58 -08:00
Cary Clark
43617c0f54
Merge "use the original hit if the cache is killed"
2010-11-30 10:23:52 -08:00
Eric Fischer
8168a694dc
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-11-30 10:12:46 -08:00
Gilles Debunne
f88cbfbb01
Merge "Dragging inside the same TextView is a move instead of a copy."
2010-11-30 10:07:41 -08:00
Mike Lockwood
be8fce59f8
Merge "MTP: Don't fail in playlist transfer if not all playlist items can be found."
2010-11-30 09:22:00 -08:00
Mike Lockwood
e9a85ed601
Merge "MTP: Make sure buffer is big enough before reading the data packet"
2010-11-30 09:21:19 -08:00
Wink Saville
89912d32b2
Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
2010-11-30 08:15:41 -08:00
Ben Murdoch
4a49235a04
Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
2010-11-30 02:43:29 -08:00
Hung-ying Tyan
570bed6841
Merge "Correct SipService.isOpened() implementation." into gingerbread
2010-11-30 00:56:57 -08:00
Hung-ying Tyan
b251e0f609
Merge "Notify SipSessions before closing SIP stack." into gingerbread
2010-11-30 00:54:51 -08:00
Hung-ying Tyan
bf08df28f3
Merge "Throw proper exceptions in SipManager" into gingerbread
2010-11-30 00:51:22 -08:00