Commit Graph

25649 Commits

Author SHA1 Message Date
Andreas Huber
a7179bcd0c Merge "Make AwesomePlayer's reset process more verbose to track down ANRs." 2011-01-04 10:37:30 -08:00
Xavier Ducrohet
6203650408 Merge "LayoutLib: Misc javadoc fixes." 2011-01-04 02:41:50 -08:00
Nick Pelly
683e01198b am c5caaf5f: am 8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit 'c5caaf5ff816a664939f305ead1091eb2c02cbf5':
  Added response flags and DSFID extras for NfcV technology (API part).
2011-01-03 22:41:40 -08:00
Nick Pelly
3cb847958a am 8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit '8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35':
  Added response flags and DSFID extras for NfcV technology (API part).
2011-01-03 22:39:42 -08:00
Nick Pelly
84680db3b5 Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread 2011-01-03 22:38:14 -08:00
Nick Pelly
b76f57c206 am d81c68c3: am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit 'd81c68c31e916fa201f4cd608261afa4d1f0adb6':
  Tweak Ndef.getType() API. Rename constants, expand javadoc.
2011-01-03 22:37:37 -08:00
Nick Pelly
f75645f66d am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb':
  Tweak Ndef.getType() API. Rename constants, expand javadoc.
2011-01-03 22:35:49 -08:00
Nick Pelly
ddf6027ea3 Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread 2011-01-03 22:32:56 -08:00
Nick Pelly
7cb15a1b5c am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e':
  Added getType() to NDEF technology class (API part).
2011-01-03 21:03:06 -08:00
Nick Pelly
775997cf4d am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit '163bd407492bbadcdc8f0759191e1b9142d06859':
  Added getType() to NDEF technology class (API part).
2011-01-03 21:01:01 -08:00
Nick Pelly
610d72deb5 Merge "Added getType() to NDEF technology class (API part)." into gingerbread 2011-01-03 20:58:26 -08:00
Nick Pelly
595066719f am 30ce5f85: am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
* commit '30ce5f8567df2132736486bb93a60f49582508ec':
  Removed selectAid() from IsoDep.
2011-01-03 20:13:17 -08:00
Nick Pelly
139ac3e470 am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
* commit '8c09ef91aef0706a012e449ba3d16c03e0d64508':
  Removed selectAid() from IsoDep.
2011-01-03 20:11:08 -08:00
Nick Pelly
5c5258a1da Merge "Removed selectAid() from IsoDep." into gingerbread 2011-01-03 20:09:03 -08:00
Nick Pelly
8caf53a8d3 am 7e4d74f7: am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
* commit '7e4d74f7b9355e8abd6e2fa30e284c9116a08998':
  Added transfer/restore convience cmds to MF Classic tech.
2011-01-03 18:37:05 -08:00
Nick Pelly
9b21188c5a am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
* commit '4b94dee8336a1135e4fc67a5911223bb5aabad99':
  Added transfer/restore convience cmds to MF Classic tech.
2011-01-03 18:34:37 -08:00
Nick Pelly
af84317c80 Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread 2011-01-03 18:33:09 -08:00
Adam Powell
2984fc07fb Merge "Fix bug 3300456 - Prevent duplicate action bar backgrounds in shared container" 2011-01-03 16:56:23 -08:00
Dianne Hackborn
23be5a3ea3 Merge "Again maybe fix issue #3169193..." 2011-01-03 15:05:29 -08:00
Amith Yamasani
9f29a70f22 Merge "Fix a layout alignment issue in RingtonePickerActivity." 2011-01-03 14:08:42 -08:00
Svetoslav Ganov
cf1a6e8601 Merge "Fixed the NumberPicker to adjust to the closest value while scrolling/flinging" 2011-01-03 13:46:33 -08:00
John Wang
58e933be60 am e8522998: am 06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit 'e85229988e6350a684be91c3bbf64232271c5663':
  Clear request list while timeout.
2011-01-03 08:49:05 -08:00
John Wang
64a7e1f026 am 06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit '06fccc325123bf4c9ebd04ac9300b504436724fe':
  Clear request list while timeout.
2011-01-03 08:46:47 -08:00
John Wang
d9883db5c5 Merge "Clear request list while timeout." into gingerbread 2011-01-03 08:44:17 -08:00
Svetoslav Ganov
15edb84fc6 Merge "3304011 At times Talkback still works after disabling it." 2010-12-29 19:22:07 -08:00
Robert Ly
1d91fd74bb Merge "Doc change: Updating toc with final restructuring changes" 2010-12-29 18:29:25 -08:00
Robert Ly
47216e97d8 Merge "Doc change: Updating title" 2010-12-29 17:32:52 -08:00
Robert Ly
5fc5b896f0 Merge "Doc change: Updating title to "connecting hardware devices"" 2010-12-29 17:32:27 -08:00
Robert Ly
99b3dd8a22 Merge "Doc change: updating title" 2010-12-29 17:32:16 -08:00
Robert Ly
9ec086874d Merge "Doc change: Updating titles" 2010-12-29 17:32:06 -08:00
Lorenzo Colitti
4eb2383511 Merge "Get rid of setupDataCallWithProtocol." 2010-12-29 17:23:33 -08:00
Dianne Hackborn
43092d724c Merge "Don't let services in persistent processes be lost after crashing." 2010-12-29 16:50:24 -08:00
Robert Greenwalt
7f7efd2b7b Merge "Cache the current value of background-data." 2010-12-29 16:29:37 -08:00
Jason Sams
48e76cbd6e Merge "Move adapter2D to a derived class from Allocation." 2010-12-29 16:27:00 -08:00
Robert Ly
813964e907 Merge "Doc change: toc changes for restructuring of dev guide" 2010-12-29 15:00:18 -08:00
Robert Ly
d50bea586d Merge "Doc change: Debugging section of dev guide restructuring" 2010-12-29 14:59:48 -08:00
Robert Ly
9db961a793 Merge "Doc change: Tools section of the dev guide restructuring" 2010-12-29 14:59:42 -08:00
Robert Ly
54fe838b38 Merge "Doc change: restructuring changes for building and running section of dev guide" 2010-12-29 14:59:35 -08:00
Robert Ly
7358a7b28e Merge "Doc change: adding Projects section of dev guide" 2010-12-29 14:59:30 -08:00
Robert Ly
c5d4d26c01 Merge "Doc change: restructuring of developing topics. Includes Overview, Creating and Managing AVDs, and Connecting HW Devices" 2010-12-29 14:59:19 -08:00
Amith Yamasani
8cc1209766 Merge "Use proper divider asset and margins." 2010-12-29 14:28:39 -08:00
Jeff Brown
288757f996 Merge "Add initial support for cursor-based pointing devices." 2010-12-29 13:22:08 -08:00
Jeff Brown
4c501a4217 Add initial support for cursor-based pointing devices.
Some parts stubbed out but you can plug in a mouse and move
a green cursor around to interact with the UI.

Change-Id: I80d597a7f11d3bd92041890f74b3c77326975e6e
2010-12-29 13:19:53 -08:00
Cary Clark
f95a66052d Merge "defer accelerator keys to hosting application" 2010-12-29 12:01:09 -08:00
Alex Sakhartchouk
d40b594001 Merge "Fixing a bug in the load function." 2010-12-29 09:22:19 -08:00
Mike Lockwood
c6f6e92748 Merge "Change libusbhost and libmtp from static to shared libraries" 2010-12-29 06:13:24 -08:00
Jean-Baptiste Queru
cc4e19f40e am a6ac0ec3: am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit 'a6ac0ec30dfdacb7baba126b5cea69fc7097496e':
  according to rfc2617, nc-value = 8LHEX
2010-12-28 15:53:41 -08:00
Jean-Baptiste Queru
f8b1da6be5 am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
  according to rfc2617, nc-value = 8LHEX
2010-12-28 15:47:42 -08:00
Jean-Baptiste Queru
19104d5357 Merge "according to rfc2617, nc-value = 8LHEX" 2010-12-28 15:33:10 -08:00
Alon Albert
f15634ccf9 am 2967aa3e: (-s ours) am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '2967aa3e6060f582f166cdb334a0fb9ff0cb4759':
  Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
2010-12-28 15:09:09 -08:00