Irfan Sheriff
b939b599e4
am b62bc963: am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
...
Merge commit 'b62bc9632250f77d29baca54419442c8d3c965ef'
* commit 'b62bc9632250f77d29baca54419442c8d3c965ef':
Fix statusbar display of wifi signalstrength
2010-09-13 17:24:49 -07:00
Dianne Hackborn
4a8ec516f0
resolved conflicts for merge of 53686433 to master
...
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Irfan Sheriff
cc5a76f9d6
am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
...
Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp
* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
Fix statusbar display of wifi signalstrength
2010-09-13 16:08:12 -07:00
Irfan Sheriff
6eedaf78bb
Merge "Fix statusbar display of wifi signalstrength" into gingerbread
2010-09-13 16:05:06 -07:00
Jaikumar Ganesh
9f5824410f
resolved conflicts for merge of 0522f5e9 to master
...
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
2010-09-13 14:57:59 -07:00
Shimeng (Simon) Wang
c999d8025e
am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread
...
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'
* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
DO NOT MERGE
2010-09-13 14:43:16 -07:00
Eric Laurent
632eb616a2
am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
...
Merge commit '4d9878502f7661ed34540a485a5942d859e209c7'
* commit '4d9878502f7661ed34540a485a5942d859e209c7':
Fix volume problems with insert revert
2010-09-13 14:42:59 -07:00
Dianne Hackborn
772eff388c
am 7e9f4eb2: Track client requests through location manager.
...
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp
* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Romain Guy
1b0ea17326
Merge "Forces windows to draw the first time they show."
2010-09-13 12:53:21 -07:00
Nipun Kwatra
aa23bf1487
Merge "Enabling time lapse in setProfile, added setCaptureRate"
2010-09-13 12:22:35 -07:00
Jaikumar Ganesh
350354e572
am cc5494c9: Out Of Band API for Secure Simple Pairing.
...
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp
* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
7be0c0b497
am fbd26467: Merge "DO NOT MERGE" into gingerbread
...
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp
* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
DO NOT MERGE
2010-09-13 11:51:55 -07:00
Eric Laurent
c2fad9102c
am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
...
Merge commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a' into gingerbread-plus-aosp
* commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a':
Fix volume problems with insert revert
2010-09-13 11:51:46 -07:00
Shimeng (Simon) Wang
c2d8c2434c
Merge "Accessibility support for WebViews"
2010-09-13 11:06:33 -07:00
Shimeng (Simon) Wang
0e152daec3
Merge "DO NOT MERGE" into gingerbread
2010-09-13 11:00:16 -07:00
Maksymilian Osowski
0af14d2141
Merge "Added overridePreference() layoutTestsController function."
2010-09-13 10:54:28 -07:00
Chris Palmer
8cb2c4f7c9
Merge "Correct the PackageManager.checkSignatures documentation."
2010-09-13 10:39:04 -07:00
Steve Block
e719ad633f
Merge "Update DumpRenderTree2 to only calculate the WebKit revision once per test run"
2010-09-13 10:29:36 -07:00
Eric Fischer
bfddc832db
Merge "Import revised translations."
2010-09-13 10:04:58 -07:00
Eric Laurent
d17ae82cf5
Merge "Fix volume problems with insert revert" into gingerbread
2010-09-13 09:14:39 -07:00
Maksymilian Osowski
0c5549ff0b
Merge "Updated the AdbUtils class to better manage opening and closing the resources."
2010-09-13 02:52:54 -07:00
Hung-ying Tyan
9439a76e42
am a5dce0c1: am 3d7606aa: SIP: enhance timeout and registration status feedback.
...
Merge commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a'
* commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a':
SIP: enhance timeout and registration status feedback.
2010-09-13 02:50:26 -07:00
Maksymilian Osowski
d424372fca
Merge "Updated FsUtils to use apache HttpClient instead of java.net UrlConnection."
2010-09-13 02:49:09 -07:00
Hung-ying Tyan
22bc063038
am 3d7606aa: SIP: enhance timeout and registration status feedback.
...
Merge commit '3d7606aa607b24817e37c264f2141ed7b2d50be0' into gingerbread-plus-aosp
* commit '3d7606aa607b24817e37c264f2141ed7b2d50be0':
SIP: enhance timeout and registration status feedback.
2010-09-13 02:48:22 -07:00
Hung-ying Tyan
a5b8a87f58
am 38dc67f4: am 25b52a2f: SIP: remove dependency on javax.sip.SipException.
...
Merge commit '38dc67f49ec77d34c858777144323960c37d045e'
* commit '38dc67f49ec77d34c858777144323960c37d045e':
SIP: remove dependency on javax.sip.SipException.
2010-09-13 02:21:09 -07:00
Hung-ying Tyan
b1492e9c55
am 25b52a2f: SIP: remove dependency on javax.sip.SipException.
...
Merge commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e' into gingerbread-plus-aosp
* commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e':
SIP: remove dependency on javax.sip.SipException.
2010-09-13 02:16:52 -07:00
Jeff Brown
a03ccb9492
am fb8116f7: am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
...
Merge commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb'
* commit 'fb8116f736f2df6d1b2f8044541390a9fd9953cb':
Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:50:16 -07:00
Jeff Brown
230b09bca3
am c891d2b3: Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
...
Merge commit 'c891d2b3529b9cf24ef4781a585cd4784815e711' into gingerbread-plus-aosp
* commit 'c891d2b3529b9cf24ef4781a585cd4784815e711':
Fix PointerLocationView when pointer ids are not zero-based.
2010-09-12 20:47:50 -07:00
Jeff Brown
37163248ad
Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
2010-09-12 20:45:31 -07:00
Mike Lockwood
449c6268c9
Merge changes I68379740,I9053218f
...
* changes:
MediaFile: Add support for some popular non-media file types.
Media scanner support for tracking files of arbitrary type.
2010-09-12 20:41:07 -07:00
Kenny Root
240f931034
am 8b11f30c: am 1bece432: Make nativeLibraryDir visible in the API
...
Merge commit '8b11f30cb2cfe9922439e8a032311de114ce4da4'
* commit '8b11f30cb2cfe9922439e8a032311de114ce4da4':
Make nativeLibraryDir visible in the API
2010-09-12 19:34:30 -07:00
Kenny Root
21c33f053c
am 1bece432: Make nativeLibraryDir visible in the API
...
Merge commit '1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp
* commit '1bece4320c1d2308b4a5b5aeda47b065312b3053':
Make nativeLibraryDir visible in the API
2010-09-12 19:31:45 -07:00
Steve Howard
016ab41b6d
am f353daa0: am 90fb15a7: Support UI visibility and restarting in download manager.
...
Merge commit 'f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1'
* commit 'f353daa03aeb3c04fdfa87b7bcd49f0a7eea59b1':
Support UI visibility and restarting in download manager.
2010-09-12 19:14:42 -07:00
Steve Howard
ff862dad9e
am 90fb15a7: Support UI visibility and restarting in download manager.
...
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp
* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
Support UI visibility and restarting in download manager.
2010-09-12 19:11:08 -07:00
Jeff Brown
064bf5ef4a
am 40e3af61: am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread
...
Merge commit '40e3af61dcbf7e49979a67410f37c4b4523a0bd6'
* commit '40e3af61dcbf7e49979a67410f37c4b4523a0bd6':
Don't play a sound if a volume key press is canceled.
2010-09-12 18:16:32 -07:00
Jeff Brown
1ad67dec16
am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread
...
Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea'
* commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea':
Undo API patch due to field pulled up to superclass.
2010-09-12 18:16:22 -07:00
Jeff Brown
f6ecec5451
am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread
...
Merge commit '8abc9e9b9917760a63cc38a030e64f207aeef86d' into gingerbread-plus-aosp
* commit '8abc9e9b9917760a63cc38a030e64f207aeef86d':
Don't play a sound if a volume key press is canceled.
2010-09-12 18:13:47 -07:00
Jeff Brown
8346872699
am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread
...
Merge commit 'ff38e38d05a39584650c7c37b4b528334529ec0f' into gingerbread-plus-aosp
* commit 'ff38e38d05a39584650c7c37b4b528334529ec0f':
Undo API patch due to field pulled up to superclass.
2010-09-12 18:13:42 -07:00
Jeff Brown
77b34573ee
Merge "Don't play a sound if a volume key press is canceled." into gingerbread
2010-09-12 18:11:42 -07:00
Jeff Brown
fa89eab3e4
Merge "Undo API patch due to field pulled up to superclass." into gingerbread
2010-09-12 18:11:05 -07:00
Kenny Root
30b17cdedd
am 1361a5bd: am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
...
Merge commit '1361a5bd1eba1cae16c301622324153c3d50b84c'
* commit '1361a5bd1eba1cae16c301622324153c3d50b84c':
Move native library removal function to helper
Initialize native library path in PackageSetting
2010-09-12 18:06:07 -07:00
Kenny Root
4ebcedf964
am 07a9e8d3: Merge changes Ie3648509,I53db73c3 into gingerbread
...
Merge commit '07a9e8d39f818e54f0feccff10c99b9629007a64' into gingerbread-plus-aosp
* commit '07a9e8d39f818e54f0feccff10c99b9629007a64':
Move native library removal function to helper
Initialize native library path in PackageSetting
2010-09-12 18:02:47 -07:00
Dianne Hackborn
19ed3b9f0b
Merge "Some fragment stuff:"
2010-09-12 18:00:25 -07:00
Kenny Root
4744fabc25
Merge changes Ie3648509,I53db73c3 into gingerbread
...
* changes:
Move native library removal function to helper
Initialize native library path in PackageSetting
2010-09-12 17:59:41 -07:00
Jeff Brown
8b84945c0c
am e740dd0c: am 69206512: Fix some API discrepancies in InputEvent.
...
Merge commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9'
* commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9':
Fix some API discrepancies in InputEvent.
2010-09-12 17:24:29 -07:00
Jeff Brown
c5fc718447
am 69206512: Fix some API discrepancies in InputEvent.
...
Merge commit '692065128e66de77470de2c50ead2bef0452952a' into gingerbread-plus-aosp
* commit '692065128e66de77470de2c50ead2bef0452952a':
Fix some API discrepancies in InputEvent.
2010-09-12 17:21:18 -07:00
Jeff Brown
055a7926e6
am 0f0541e4: am b88102f5: Input dispatcher ANR handling enhancements.
...
Merge commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6'
* commit '0f0541e40cfef51eb5c3769e53c1aa853b53aaf6':
Input dispatcher ANR handling enhancements.
2010-09-12 17:15:19 -07:00
Jeff Brown
0162133795
am b88102f5: Input dispatcher ANR handling enhancements.
...
Merge commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1' into gingerbread-plus-aosp
* commit 'b88102f5b7e51552a3576cf197b4c8cf96f193d1':
Input dispatcher ANR handling enhancements.
2010-09-12 17:05:38 -07:00
Jeff Brown
a665ca805c
Input dispatcher ANR handling enhancements.
...
This change is essentially a rewrite of the main input dispatcher loop
with the target identification folded in. Since the input dispatcher now
has all of the window state, it can make better decisions about
when to ANR.
Added a .5 second deadline for processing app switch keys. This behavior
predates Gingerbread but had not previously been ported.
Fixed some timing inaccuracies in the ANR accounting that could cause
applications to ANR sooner than they should have.
Added a mechanism for tracking key and motion events that have been
dispatched to a window so that appropriate cancelation events can be
synthesized when recovering from ANR. This change helps to keep
applications in sync so they don't end up with stuck buttons upon
recovery from ANRs.
Added more comments to describe the tricky parts of PollLoop.
Change-Id: I13dffca27acb436fc383980db536abc4d8b9e6f1
2010-09-12 16:52:03 -07:00
Adam Powell
b7070deffb
Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture"
2010-09-12 14:19:46 -07:00