Lorenzo Colitti
69418b43e9
Merge "Fix IPv6->IPv4 fallback for HTTPS."
2011-03-03 17:04:21 -08:00
Wink Saville
a916c69edb
Merge "ApnSettings: Removal of Enabled, Class and Inactivity Timer."
2011-03-03 16:02:10 -08:00
Carl Shapiro
35459558c8
Merge "Establish a global reference before saving a class into a global."
2011-03-03 14:44:50 -08:00
Irfan Sheriff
2bce7ea66d
Merge "update current config with dhcp settings"
2011-03-03 14:39:59 -08:00
Andreas Huber
ebbfa938de
Merge "Reject streaming .mp4 files over http that are not muxed reasonably."
2011-03-03 14:33:25 -08:00
Carl Shapiro
2aa44be08f
Merge "Eliminate an assignment of a local reference to a global variable."
2011-03-03 14:13:09 -08:00
Leon Scroggins
fd8f5a4a4e
Merge "Assets for WebView buttons."
2011-03-03 12:33:34 -08:00
Fabrice Di Meglio
b83025cf80
Merge "Add TextLayout Cache"
2011-03-03 12:21:15 -08:00
Mike Lockwood
5bbd6a9bcb
am 43f0640f: (-s ours) am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
...
* commit '43f0640fbf476404139eb8a196465000933da4ef':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
2011-03-03 11:46:51 -08:00
Mike Lockwood
d8cd74f684
am 86f1c4d3: (-s ours) am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
...
* commit '86f1c4d3ba53ea11484628081e8e49ca86e897b9':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
2011-03-03 11:46:48 -08:00
Scott Main
0975816989
am 6c8d7652: am f1d8e049: docs: fix error in themes doc
...
* commit '6c8d76527c938eb49182a6fd0677ccbc1618e7a8':
docs: fix error in themes doc
2011-03-03 11:46:37 -08:00
Mike Lockwood
8a993b481f
am d948b85d: (-s ours) am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
...
* commit 'd948b85dc9d0362a2ba0f7a3b905be0107a948f4':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
2011-03-03 11:42:13 -08:00
Mike Lockwood
a4c4fbe3b0
am e91e5f6e: (-s ours) am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect" into gingerbread
...
* commit 'e91e5f6e9db4db5cd53836c901a7f80c11abb55c':
DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
2011-03-03 11:42:05 -08:00
Stephen Hines
07eeadb7fe
Merge "Almost all warnings are now errors in RS build."
2011-03-03 10:34:25 -08:00
Stephen Hines
934dcc7889
Merge "Fix typos in RenderScript docs."
2011-03-03 10:34:03 -08:00
Scott Main
f039adc726
am f1d8e049: docs: fix error in themes doc
...
* commit 'f1d8e04912b6a4031e0d1f129c231de869852a04':
docs: fix error in themes doc
2011-03-03 10:06:20 -08:00
Leon Scroggins
ec11f4057e
Merge "Move NinePatchPeeker into its own file."
2011-03-03 09:13:22 -08:00
Robert Greenwalt
7065151cc8
Merge "Clean up LTE code change"
2011-03-03 08:33:54 -08:00
Robert Greenwalt
7eb811e0f5
Merge "Add some input checking to prevent problems"
2011-03-03 08:32:53 -08:00
Jeff Brown
b0345f60ba
Merge "Recognize 3D joysticks."
2011-03-03 03:40:34 -08:00
satok
4de1ccb8c7
Merge "Add tests for SystemProperties.java"
2011-03-03 02:56:00 -08:00
Jeff Brown
8097fb47cd
Merge "Fix off by one errors in touch motion ranges."
2011-03-03 02:41:36 -08:00
Bjorn Bringert
b263d690ff
Merge "Pass AppData to the app from SearchDialog queries."
2011-03-03 00:18:23 -08:00
Bjorn Bringert
411dce405e
Merge "A Java implementation of the SearchBox API."
2011-03-03 00:11:25 -08:00
Bjorn Bringert
5413796ed0
Merge "Fixed NPE in ActivityManager's launch count service."
2011-03-03 00:10:03 -08:00
Jeff Brown
5d15ed19e0
Merge "Add new ViewConfiguration accessors for key repeat parameters."
2011-03-02 22:51:50 -08:00
Dianne Hackborn
a843f27bd8
Merge "Fix issue #3485923 : Gmail crash"
2011-03-02 22:44:55 -08:00
Eric Fischer
e9de8e1bfb
am 6498f2fe: (-s ours) am 190586b7: Import revised translations. DO NOT MERGE
...
* commit '6498f2fed29042cce29faadcf0cc6b74180e1ba0':
Import revised translations. DO NOT MERGE
Initialize mRetyMgr when constructing GsmDataConnectionTracker.
2011-03-02 22:26:51 -08:00
Patrick Dubroy
ea7ff14a35
Merge "Make sure we send a cancel event on system bar keys."
2011-03-02 22:19:31 -08:00
Simon Wilson
bcc6f5b2ca
am df58a1bb: am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612 " into gingerbread
...
* commit 'df58a1bbf8d7f6608848eae4d5d48dcff137dc8c':
Attempt to reduce problems from issue #3183612
2011-03-02 22:11:19 -08:00
Mike Lockwood
757d02ef46
am 093430fd: (-s ours) am b13581a9: (-s ours) am 1110748b: DO NOT MERGE: USB accessory support library
...
* commit '093430fd5dbbdc6f5e0de6f25f6f9bb381cdd239':
DO NOT MERGE: USB accessory support library
2011-03-02 22:11:14 -08:00
Mike Lockwood
0dcf28ff97
am 17fc2ce4: (-s ours) am 7866be2b: (-s ours) am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread
...
* commit '17fc2ce479b70a539cf3aaf0e89829ad6eedc2b6':
DO NOT MERGE: Backport USB accessory support to gingerbread
2011-03-02 22:11:07 -08:00
Mike Lockwood
fb8cb42878
am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if there are no apps available for an accessory
...
* commit '611af238185cf924a425a1a2154b8439b8f8d7a5':
DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
2011-03-02 22:07:59 -08:00
Mike Lockwood
83bcc20eb3
Merge " UsbManager: Don't display activity picker if there are no apps available for an accessory"
2011-03-02 22:00:02 -08:00
Jeff Brown
af165de7fe
Merge "Get key repeat timeout and delay from ViewConfiguration."
2011-03-02 21:43:40 -08:00
Mike Lockwood
ef045cc545
Merge "UsbManager: Don't display activity picker if there are no apps available for a device"
2011-03-02 21:41:53 -08:00
Jeff Brown
531054e83e
Merge "Only set KeyEvent long press flag when repeat count equals 1."
2011-03-02 21:30:25 -08:00
Daniel Sandler
e27e311713
Merge "Pressed states for the notification panel's title area."
2011-03-02 21:20:08 -08:00
Jim Miller
ccfeeac29e
Merge "Fix 3502257: Fix glow calculation in EdgeGlow"
2011-03-02 20:52:16 -08:00
Jim Miller
e6f66ee515
Merge "Fix 3504984: Use overscroll fade in Recents."
2011-03-02 20:49:31 -08:00
Jeff Brown
18e9f5d241
Merge "Wake screen from external HID peripherals."
2011-03-02 19:59:07 -08:00
Jeff Brown
d5ed285606
Wake screen from external HID peripherals.
...
Added some plumbing to enable the policy to intercept motion
events when the screen is off to handle wakeup if needed.
Added a basic concept of an external device to limit the scope
of the wakeup policy to external devices only. The wakeup policy
for internal devices should be based on explicit rules such as
policy flags in key layout files.
Moved isTouchEvent to native.
Ensure the dispatcher sends the right event type to userActivity
for non-touch pointer events like HOVER_MOVE and SCROLL.
Bug: 3193114
Change-Id: I15dbd48a16810dfaf226ff7ad117d46908ca4f86
2011-03-02 19:57:07 -08:00
Gilles Debunne
e5091dd8df
Merge "Removed documentation links"
2011-03-02 19:52:30 -08:00
Gloria Wang
ea4cd693c2
Merge "- To track the usage of all audio output devices - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()"
2011-03-02 19:51:04 -08:00
Gloria Wang
1d0599ff95
Merge "Do not call processDrmInfo if acquireDrmInfo returns null"
2011-03-02 19:50:41 -08:00
Svetoslav Ganov
b720d0acb3
Merge "Add system wide management of core settings"
2011-03-02 19:17:06 -08:00
Mathias Agopian
b1fb7bac5b
Merge "remove some logs"
2011-03-02 18:51:00 -08:00
Mathias Agopian
1c71a47a6d
remove some logs
...
Change-Id: Ia476184048ee419e19330a56dc8e6553189f6a24
2011-03-02 18:45:50 -08:00
Chet Haase
e703580ffe
Merge "Cancel LayoutTransition animations selectively"
2011-03-02 18:39:11 -08:00
Jean-Michel Trivi
609bd12dac
Merge "Fix bug 3425610 Adjust Lock sound level"
2011-03-02 18:37:07 -08:00