Brian Carlstrom
266814c618
Merge "Import libcore_to_document definition from libcore/Docs.mk"
2011-01-05 21:53:32 -08:00
Dianne Hackborn
de5c33a890
Merge "Implement issue #3326435 : Battery stats improvements"
2011-01-05 21:35:56 -08:00
Adam Powell
5acb9b4f59
Merge "Fix bug 3242965 - Unreadable text in context menus using legacy theme"
2011-01-05 21:10:16 -08:00
Joe Onorato
15942e9a57
Merge "Make the volume keys adjust the media volume by default if the device is not "voice capable.""
2011-01-05 20:53:14 -08:00
Joe Onorato
7b4bea8497
Merge "Fix the 3G icon shows as G."
2011-01-05 20:53:05 -08:00
James Dong
adbc5e9e44
am a8ce7736: am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
...
* commit 'a8ce773607c26dd4336f57856afce507fb98a279':
Suppress the recording sound in the recorded video
2011-01-05 17:57:55 -08:00
James Dong
54f6bb5718
am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
...
* commit '35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
2011-01-05 17:55:27 -08:00
James Dong
da57245bae
Merge "Suppress the recording sound in the recorded video" into gingerbread
2011-01-05 17:53:18 -08:00
Justin Ho
d4759b8b00
Merge "Updated HDPI assets from Gingerbread"
2011-01-05 17:50:26 -08:00
Robert Greenwalt
99266b1e79
Merge "Allow bumpDns() to execute correctly before boot has completed"
2011-01-05 17:47:18 -08:00
Jean-Michel Trivi
06646a91dd
Merge "Add support in TTS for volume and panning control of the synth output"
2011-01-05 17:36:46 -08:00
Justin Ho
ea3a91918f
Merge "Updated presence icons and new emergency icon"
2011-01-05 17:27:04 -08:00
Adam Powell
37dfd474cb
Merge "Fix Holo Spinners"
2011-01-05 17:10:56 -08:00
Justin Ho
2bf00e44d0
Merge "Updated assets from gingerbread"
2011-01-05 17:00:26 -08:00
Andreas Huber
98aa1b9a42
Merge "Some more fixes regarding HTTP live in NuPlayer."
2011-01-05 16:34:06 -08:00
Brian Muramatsu
62319b5c78
Merge "Add MipmapDrawableTest"
2011-01-05 15:19:38 -08:00
Amith Yamasani
c1b00211bd
Merge "Use an opaque background for the search bar in legacy SearchDialog."
2011-01-05 15:17:50 -08:00
Jeff Brown
932a2f1241
Merge "Add dispatch key shortcut window callback."
2011-01-05 14:52:07 -08:00
Andreas Huber
7d5ac774bd
Merge "Seek/Duration support for completed http live streams in NuPlayer."
2011-01-05 14:50:00 -08:00
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