Commit Graph

25684 Commits

Author SHA1 Message Date
Dianne Hackborn
9d63f84864 Merge "No longer needed." 2011-01-04 22:45:44 -08:00
Jason Sams
abd7bd4db7 Merge "Random cleanup" 2011-01-04 22:31:15 -08:00
Jason Sams
04db6180dc Merge "unhide renderscript" 2011-01-04 22:23:05 -08:00
Joe Onorato
d75f02a435 Merge changes I49263df9,Ie733ad38,I84908fd3,Ia4e869b8,I8240e763,Id5704cc5
* changes:
  fix the build
  Don't re-show the ticker for a notification if they have set FLAG_ONLY_SHOW_ONCE.
  Notification.Builder.setAutoCancel() was setting the wrong flag.
  Allow taps on the ticker to pass through to the notification target view so the notification panel still opens.
  The whole title area of the notification panel should toggle the settings view.
  When the number field on a notifications is >100, just say "100+" instead of listing the number.
2011-01-04 18:54:49 -08:00
Nick Pelly
d70b1e2069 am 978e41fc: am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '978e41fccf278bb64c5204d80d8de95c9bf2e3d5':
  Fix technology extra naming for IsoDep and NfcB (API part).
2011-01-04 18:35:40 -08:00
Nick Pelly
26e102d2b1 am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '8d98aebe286be0ca963232afce3d5ceec67d3d7a':
  Fix technology extra naming for IsoDep and NfcB (API part).
2011-01-04 18:33:41 -08:00
Nick Pelly
83f1f8ce07 Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread 2011-01-04 18:31:19 -08:00
James Dong
75e34731c0 Merge "Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java" 2011-01-04 18:19:45 -08:00
Hung-ying Tyan
1291d4a231 am 05c53067: am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '05c53067b613796624937214e506c58de817c8fd':
  Fix setting audio group mode in SipPhone.
2011-01-04 17:49:48 -08:00
Hung-ying Tyan
25cde516e1 am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
  Fix setting audio group mode in SipPhone.
2011-01-04 17:47:47 -08:00
Hung-ying Tyan
675b5b008f Merge "Fix setting audio group mode in SipPhone." into gingerbread 2011-01-04 17:45:36 -08:00
Dianne Hackborn
89bafcc03f Merge "Some new API cleanup." 2011-01-04 17:42:45 -08:00
Chia-chi Yeh
8358ce843f am dc78e3fe: am 3cf71376: RTP: Send silence packets on idle streams for every second.
* commit 'dc78e3fe7f2ffbc810cd54e86e3a83e279d74984':
  RTP: Send silence packets on idle streams for every second.
2011-01-04 17:41:16 -08:00
Chia-chi Yeh
52ff631261 am 3cf71376: RTP: Send silence packets on idle streams for every second.
* commit '3cf71376421f942d06b30101fbf0df7f3b23fbdd':
  RTP: Send silence packets on idle streams for every second.
2011-01-04 17:37:17 -08:00
Jeff Brown
4125036157 Mouse pointer integration.
Added support for loading the pointer icon from a resource.

Moved the system server related bits of the input manager out
of libui and into libinput since they do not need to be linked into
applications.

Change-Id: Iec11e0725b3add2b905c51f8ea2c3b4b0d1a2d67
2011-01-04 17:31:24 -08:00
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