Commit Graph

25497 Commits

Author SHA1 Message Date
Mike Lockwood
534cd0adbb Merge "MTP: Add support for reserve storage setting to avoid low storage situations." 2010-12-12 12:22:57 -08:00
Jeff Hamilton
29ffaa34fc am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-11 20:58:38 -08:00
Jason Sams
ef5eb8a5ea Merge "Add multitouch support to physics test. Fix context state overwrite calling invoke." 2010-12-11 18:52:37 -08:00
Martijn Coenen
89c62f3e1f am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-10 20:40:40 -08:00
Martijn Coenen
7deb35efd0 am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit 'fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
  Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-10 20:40:34 -08:00
Martijn Coenen
f3147d384f am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
  Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-10 20:40:26 -08:00
James Dong
1986a74ef1 Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers" 2010-12-10 17:34:52 -08:00
Nick Pelly
0ee0b92202 am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
  Make getSystemService(NFC_SERVICE) the NFC entry point.
2010-12-10 17:19:45 -08:00
Gilles Debunne
e3db6755d2 Merge "TextView's runnable are stopped when the View is detached." 2010-12-10 17:19:06 -08:00
Gilles Debunne
fcbff840c0 Merge "Modified OverScroller curves" 2010-12-10 17:18:37 -08:00
Nick Pelly
3cb8da45a2 Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread 2010-12-10 17:18:00 -08:00
John Wang
9ae5f6439c Merge "Notify voicemail only for voice-capable device." 2010-12-10 16:55:36 -08:00
Adam Powell
ad5510b76e Merge "Fix a bug where the fast scroll track would be positioned incorrectly." 2010-12-10 16:33:47 -08:00
Mathias Agopian
c44375ce71 Merge "[3258939] Need snapshot to limit which layers are included" 2010-12-10 16:30:46 -08:00
Mathias Agopian
bf2c6a6c8f [3258939] Need snapshot to limit which layers are included
Change-Id: Id7351a0e3f53dde99b291cffba553d89fd4d7ca9
2010-12-10 16:22:31 -08:00
Jason Sams
c42240456b Merge "Remove CreateFromBitmapRef and add CopyTo(bitmap) replacement." 2010-12-10 16:06:19 -08:00
John Wang
1c5efbd740 Merge "Block SMS service for non-sms-capable device." 2010-12-10 16:05:51 -08:00
Amith Yamasani
d427b27c5e Merge "Potential fix for Settings screen ClassCast exception on the phone." 2010-12-10 15:39:41 -08:00
Mathias Agopian
e6f096a4cd dump callstack on Surface use error
Change-Id: I38e260dd47349b9af3a999dda683a083a94be16d
2010-12-10 15:37:48 -08:00
Xia Wang
abc68413b5 Merge "Make Wi-Fi stress tests output log consistent. Fix: record average at the beginning of each iteration" 2010-12-10 14:49:18 -08:00
Romain Guy
6faf73a102 Merge "Ignore empty layers." 2010-12-10 14:42:21 -08:00
Brad Fitzpatrick
dce37adef0 Merge "StrictMode "custom" trigger support." 2010-12-10 14:19:58 -08:00
Gilles Debunne
49acf8d583 Merge "Selecting text from a punctuation sign selects previous word." 2010-12-10 13:50:51 -08:00
Dianne Hackborn
59249e530a Merge "Turn off screenshot capturing for thumbnails." 2010-12-10 13:44:13 -08:00
Adam Powell
364a3ef473 Merge "Fix bug 3257463 - Yes, we SHOULD put the child in the recycler." 2010-12-10 13:30:37 -08:00
Megha Joshi
18d2079e02 am 87c03b58: (-s ours) am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '87c03b58a9468caec18b161128ab14de90764fd4':
  Integrating webinar hosting with developer.android.com
2010-12-10 12:52:19 -08:00
Megha Joshi
35ff21301e am 7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
  Integrating webinar hosting with developer.android.com
2010-12-10 12:33:59 -08:00
Romain Guy
f7620c947c Merge "Correctly compare strings in UTF-8 instead of UTF-16 Bug #3272858" 2010-12-10 12:33:34 -08:00
Megha Joshi
ebce77e665 Merge "Integrating webinar hosting with developer.android.com" into gingerbread 2010-12-10 12:30:35 -08:00
Xavier Ducrohet
c355804ae7 Merge "LayoutLib: Adapt to new LayoutLib" 2010-12-10 12:14:04 -08:00
Eric Laurent
f96a505940 Merge "Fix audio mode log." 2010-12-10 12:09:06 -08:00
Gilles Debunne
676727cb3e Merge "Added visual feedback to text correction." 2010-12-10 11:59:13 -08:00
Wink Saville
7d16a79cc1 Merge "Make activation rejection a non-permanent error." 2010-12-10 11:43:33 -08:00
Gilles Debunne
b236e7c018 Merge "New API in InputConnection to signal IME's text correction." 2010-12-10 11:34:22 -08:00
Eric Fischer
d77b6a9b41 Merge "Import revised translations." 2010-12-10 10:55:54 -08:00
John Reck
8f48ad481d Merge "Fixes Android HTTP cache permissions" 2010-12-10 10:21:56 -08:00
Eric Fischer
45956d577f am af22f4f1: (-s ours) am 767926bb: Import revised translations. DO NOT MERGE
* commit 'af22f4f16da1823a14f5f60012dffafb14b0d02b':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:08:10 -08:00
Eric Fischer
c95e5288c5 am 767926bb: Import revised translations. DO NOT MERGE
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
  Import revised translations.  DO NOT MERGE
2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
8c605feb4f am 81266d99: am a218e014: reconcile with open-source gingerbread
* commit '81266d9936605ab3fb6347d28cd7f4a81d6e23e0':
2010-12-10 08:54:14 -08:00
Jean-Baptiste Queru
63fa070253 am a218e014: reconcile with open-source gingerbread
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
2010-12-10 08:49:37 -08:00
James Dong
9373a724d3 Merge "We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME)." 2010-12-10 07:33:13 -08:00
Ben Murdoch
ccac87de81 Merge "Add a "Web Search" option to the WebView select text ActionBar" 2010-12-10 05:52:03 -08:00
Adam Powell
fded57d33a Merge "Holo scrollbars and related tweaks." 2010-12-09 23:02:11 -08:00
Mike Lockwood
1b64f9cf56 Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService" 2010-12-09 22:53:27 -08:00
James Dong
4f7d7be7a3 Merge "First step towards renabling Timelapse video recording" 2010-12-09 20:27:59 -08:00
Dianne Hackborn
eda331c952 Merge "Fix issue #3272051: Use backward transition when going backwards." 2010-12-09 19:25:17 -08:00
Jeff Brown
abed74c8c4 Merge "Fix race condition in fallback key processing." 2010-12-09 18:54:35 -08:00
Mike Lockwood
0049d8aa38 Merge "MTP host: Handle receiving a response packet instead of data packet." 2010-12-09 18:42:13 -08:00
Jeff Brown
7999039b77 Fix race condition in fallback key processing.
Need to ensure that the channel is still valid before proceeding.

Bug: 3271482
Change-Id: Ia6863cbedd9b53cbc5c9c8815e9ea90bef3d2218
2010-12-09 18:14:23 -08:00
Romain Guy
08b01a41c7 Merge "Don't set the invisible flag when saving an empty layer. Bug #3270371" 2010-12-09 17:47:09 -08:00