Commit Graph

25819 Commits

Author SHA1 Message Date
Romain Guy
d95aaf3982 Merge "Change the OpenGL viewport when new layout params are used. Bug #3303158" 2011-01-04 16:08:34 -08:00
Gilles Debunne
ff7e3f57b2 Merge "Revert "Fix for ellipsized text that has two lines at maximum."" 2011-01-04 15:42:40 -08:00
Jim Miller
c0ffc5508f Merge "Fix 3309250: Don't crash when thumbnail is null" 2011-01-04 15:37:16 -08:00
Vasu Nori
ef0a565dd1 Merge "treat "can't open database file error" as "database corruption error"" 2011-01-04 15:05:21 -08:00
Romain Guy
8ed7636ce3 Merge "Keep a reference to the local matrix. Bug #3299324" 2011-01-04 15:00:48 -08:00
Andreas Huber
50e256a182 Merge "Properly shutdown the decoders on a reset() in NuPlayer's implementation." 2011-01-04 14:47:18 -08:00
Derek Sollenberger
27ab638423 Merge "Add full-screen support for OpenGL based plugins." 2011-01-04 13:42:41 -08:00
Jesse Wilson
b3ebb2a077 Merge "Update API of PropertyChangeSupport, which is no longer synchronized." 2011-01-04 13:37:00 -08:00
Vasu Nori
94c7cb5ebb Merge "don't call methods doing database lock from a synchronized block" 2011-01-04 13:18:17 -08:00
Michael Jurka
f7ea870c40 Merge "Fixed bug with reverseTransition" 2011-01-04 13:14:31 -08:00
James Dong
e488208d21 Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method" 2011-01-04 13:12:47 -08:00
Vasu Nori
618657709f Merge "when cursorwindow allocation fails, print the number of cursors left open" 2011-01-04 12:15:53 -08:00
Robert Ly
e4ab2e45ae Merge "Doc change: deleting tips section that was merged into index.jd" 2011-01-04 12:05:40 -08:00
Robert Ly
7a3b3a1448 Merge "Doc change: removing debugging tips from nav" 2011-01-04 12:05:24 -08:00
Dianne Hackborn
4881035648 Merge "Few little fragment, wm tweaks." 2011-01-04 11:40:14 -08:00
Robert Ly
13e397c12d Merge "Doc change: Updating titles" 2011-01-04 11:20:56 -08:00
Robert Ly
044f2bfe41 Merge "Doc change: Updating titles" 2011-01-04 11:20:43 -08:00
Robert Greenwalt
30e435e0fc Merge "Always file DUN requests for tethering." 2011-01-04 11:17:51 -08:00
John Reck
95584b50b9 Merge "Fix testGetAllVisitedUrls to match BP1 behavior" 2011-01-04 11:02:05 -08:00
Svetoslav Ganov
9b02c2bbd2 Merge "Fixing bugs 3315632 3235958, performing a clean up of the WebView accessibility feature. Updated event hadndling to deliver all key events to javaScript if a screen reader is injected since the latter is responsible for the full set of navigation and exploration actions." 2011-01-04 10:59:48 -08:00
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