Brad Fitzpatrick
8b03f74d4c
resolved conflicts for merge of 3a2c6bf0 to master
...
Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe
2011-01-05 14:04:06 -08:00
Brad Fitzpatrick
d02d09416d
am 69ea4e15: Documentation fixes found over vacation hacking.
...
* commit '69ea4e15e52c456537575d21443ac1efdb03a902':
Documentation fixes found over vacation hacking.
2011-01-05 13:52:53 -08:00
Jeff Brown
57e9f2615b
Merge "Only allow touch events from one device at a time."
2011-01-05 13:44:05 -08:00
Shimeng (Simon) Wang
01ee482278
Merge "Refactor zoom overview width calculation."
2011-01-05 13:05:29 -08:00
Leon Scroggins
d256d6fdc0
Merge "Show the keyboard when opening Find from the menu."
2011-01-05 12:57:37 -08:00
James Dong
5714e77a66
Merge "Fixed a typo in the enum for unknown camera error message"
2011-01-05 12:53:13 -08:00
Jason parks
04638514e8
Merge "Add decryption support to MountService."
2011-01-05 11:56:42 -08:00
Leon Scroggins
e53ac4d206
Merge "Do not open the keyboard when opening Find from CAB."
2011-01-05 11:14:58 -08:00
Patrick Scott
0796a9c35c
Merge "Use the app context to avoid a memory leak."
2011-01-05 11:07:21 -08:00
Romain Guy
92dd47f283
Merge changes Ia8a15db8,I20ac5203
...
* changes:
Don't enable hardware acceleration when the app owns the surface. Bug #3323096
Make FrameLayout support mixed wrap_content/match_parent children. Bug #3259668
2011-01-05 10:32:15 -08:00
James Dong
c0307244b3
Merge "Use video output if necessary for timelapse video recording"
2011-01-05 10:27:55 -08:00
Jason Sams
9ad993b001
Merge "fix build"
2011-01-04 23:17:31 -08:00
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