OSDN Git Service
Adam Powell [Tue, 14 Sep 2010 00:25:04 +0000 (17:25 -0700)]
am
59a29f4a: (-s ours) am
b07c0789: Merge "DO NOT MERGE Fix bug
2995887 - overscroll effect initialization issue" into gingerbread
Merge commit '
59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c'
* commit '
59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c':
DO NOT MERGE Fix bug
2995887 - overscroll effect initialization issue
Irfan Sheriff [Tue, 14 Sep 2010 00:24:49 +0000 (17:24 -0700)]
am
b62bc963: am
ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
Merge commit '
b62bc9632250f77d29baca54419442c8d3c965ef'
* commit '
b62bc9632250f77d29baca54419442c8d3c965ef':
Fix statusbar display of wifi signalstrength
Dianne Hackborn [Mon, 13 Sep 2010 23:02:57 +0000 (16:02 -0700)]
resolved conflicts for merge of
53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
Adam Powell [Mon, 13 Sep 2010 23:11:55 +0000 (16:11 -0700)]
am
b07c0789: Merge "DO NOT MERGE Fix bug
2995887 - overscroll effect initialization issue" into gingerbread
Merge commit '
b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp
* commit '
b07c078921fb917d33075a63d77fdf98221e2bac':
DO NOT MERGE Fix bug
2995887 - overscroll effect initialization issue
Adam Powell [Mon, 13 Sep 2010 23:09:51 +0000 (16:09 -0700)]
Merge "DO NOT MERGE Fix bug
2995887 - overscroll effect initialization issue" into gingerbread
Irfan Sheriff [Mon, 13 Sep 2010 23:08:12 +0000 (16:08 -0700)]
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
Irfan Sheriff [Mon, 13 Sep 2010 23:05:06 +0000 (16:05 -0700)]
Merge "Fix statusbar display of wifi signalstrength" into gingerbread
Jaikumar Ganesh [Mon, 13 Sep 2010 21:57:59 +0000 (14:57 -0700)]
resolved conflicts for merge of
0522f5e9 to master
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
Shimeng (Simon) Wang [Mon, 13 Sep 2010 21:43:16 +0000 (14:43 -0700)]
am
4de4f09e: (-s ours) am
fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit '
4de4f09e8ed95255c1077cfbbaf018877221455d'
* commit '
4de4f09e8ed95255c1077cfbbaf018877221455d':
DO NOT MERGE
Eric Laurent [Mon, 13 Sep 2010 21:42:59 +0000 (14:42 -0700)]
am
4d987850: am
bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
Merge commit '
4d9878502f7661ed34540a485a5942d859e209c7'
* commit '
4d9878502f7661ed34540a485a5942d859e209c7':
Fix volume problems with insert revert
Dianne Hackborn [Mon, 13 Sep 2010 21:34:22 +0000 (14:34 -0700)]
am
7e9f4eb2: Track client requests through location manager.
Merge commit '
7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp
* commit '
7e9f4eb2608148436cef36c9969bf8a599b39e72':
Track client requests through location manager.
Romain Guy [Mon, 13 Sep 2010 19:53:21 +0000 (12:53 -0700)]
Merge "Forces windows to draw the first time they show."
Nipun Kwatra [Mon, 13 Sep 2010 19:22:35 +0000 (12:22 -0700)]
Merge "Enabling time lapse in setProfile, added setCaptureRate"
Jaikumar Ganesh [Mon, 13 Sep 2010 18:52:19 +0000 (11:52 -0700)]
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.
Shimeng (Simon) Wang [Mon, 13 Sep 2010 18:51:55 +0000 (11:51 -0700)]
am
fbd26467: Merge "DO NOT MERGE" into gingerbread
Merge commit '
fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp
* commit '
fbd2646705c52c111f041b16d7cb34cb922a2a64':
DO NOT MERGE
Eric Laurent [Mon, 13 Sep 2010 18:51:46 +0000 (11:51 -0700)]
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
Shimeng (Simon) Wang [Mon, 13 Sep 2010 18:06:32 +0000 (11:06 -0700)]
Merge "Accessibility support for WebViews"
Shimeng (Simon) Wang [Mon, 13 Sep 2010 18:00:16 +0000 (11:00 -0700)]
Merge "DO NOT MERGE" into gingerbread
Maksymilian Osowski [Mon, 13 Sep 2010 17:54:28 +0000 (10:54 -0700)]
Merge "Added overridePreference() layoutTestsController function."
Chris Palmer [Mon, 13 Sep 2010 17:39:04 +0000 (10:39 -0700)]
Merge "Correct the PackageManager.checkSignatures documentation."
Steve Block [Mon, 13 Sep 2010 17:29:36 +0000 (10:29 -0700)]
Merge "Update DumpRenderTree2 to only calculate the WebKit revision once per test run"
Eric Fischer [Mon, 13 Sep 2010 17:04:58 +0000 (10:04 -0700)]
Merge "Import revised translations."
Eric Laurent [Mon, 13 Sep 2010 16:14:39 +0000 (09:14 -0700)]
Merge "Fix volume problems with insert revert" into gingerbread
Maksymilian Osowski [Mon, 13 Sep 2010 09:52:54 +0000 (02:52 -0700)]
Merge "Updated the AdbUtils class to better manage opening and closing the resources."
Hung-ying Tyan [Mon, 13 Sep 2010 09:50:26 +0000 (02:50 -0700)]
am
a5dce0c1: am
3d7606aa: SIP: enhance timeout and registration status feedback.
Merge commit '
a5dce0c15ac05724b4595d62d521a481c7e1f86a'
* commit '
a5dce0c15ac05724b4595d62d521a481c7e1f86a':
SIP: enhance timeout and registration status feedback.
Maksymilian Osowski [Mon, 13 Sep 2010 09:49:09 +0000 (02:49 -0700)]
Merge "Updated FsUtils to use apache HttpClient instead of java.net UrlConnection."
Hung-ying Tyan [Mon, 13 Sep 2010 09:48:22 +0000 (02:48 -0700)]
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.
Hung-ying Tyan [Mon, 13 Sep 2010 09:21:09 +0000 (02:21 -0700)]
am
38dc67f4: am
25b52a2f: SIP: remove dependency on javax.sip.SipException.
Merge commit '
38dc67f49ec77d34c858777144323960c37d045e'
* commit '
38dc67f49ec77d34c858777144323960c37d045e':
SIP: remove dependency on javax.sip.SipException.
Hung-ying Tyan [Mon, 13 Sep 2010 09:16:52 +0000 (02:16 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 03:50:16 +0000 (20:50 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 03:47:50 +0000 (20:47 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 03:45:31 +0000 (20:45 -0700)]
Merge "Fix PointerLocationView when pointer ids are not zero-based." into gingerbread
Mike Lockwood [Mon, 13 Sep 2010 03:41:07 +0000 (20:41 -0700)]
Merge changes I68379740,I9053218f
* changes:
MediaFile: Add support for some popular non-media file types.
Media scanner support for tracking files of arbitrary type.
Kenny Root [Mon, 13 Sep 2010 02:34:30 +0000 (19:34 -0700)]
am
8b11f30c: am
1bece432: Make nativeLibraryDir visible in the API
Merge commit '
8b11f30cb2cfe9922439e8a032311de114ce4da4'
* commit '
8b11f30cb2cfe9922439e8a032311de114ce4da4':
Make nativeLibraryDir visible in the API
Kenny Root [Mon, 13 Sep 2010 02:31:45 +0000 (19:31 -0700)]
am
1bece432: Make nativeLibraryDir visible in the API
Merge commit '
1bece4320c1d2308b4a5b5aeda47b065312b3053' into gingerbread-plus-aosp
* commit '
1bece4320c1d2308b4a5b5aeda47b065312b3053':
Make nativeLibraryDir visible in the API
Steve Howard [Mon, 13 Sep 2010 02:14:42 +0000 (19:14 -0700)]
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.
Steve Howard [Mon, 13 Sep 2010 02:11:08 +0000 (19:11 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 01:16:32 +0000 (18:16 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 01:16:22 +0000 (18:16 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 01:13:47 +0000 (18:13 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 01:13:42 +0000 (18:13 -0700)]
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.
Jeff Brown [Mon, 13 Sep 2010 01:11:42 +0000 (18:11 -0700)]
Merge "Don't play a sound if a volume key press is canceled." into gingerbread
Jeff Brown [Mon, 13 Sep 2010 01:11:05 +0000 (18:11 -0700)]
Merge "Undo API patch due to field pulled up to superclass." into gingerbread
Kenny Root [Mon, 13 Sep 2010 01:06:07 +0000 (18:06 -0700)]
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
Kenny Root [Mon, 13 Sep 2010 01:02:47 +0000 (18:02 -0700)]
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
Dianne Hackborn [Mon, 13 Sep 2010 01:00:25 +0000 (18:00 -0700)]
Merge "Some fragment stuff:"
Kenny Root [Mon, 13 Sep 2010 00:59:41 +0000 (17:59 -0700)]
Merge changes Ie3648509,I53db73c3 into gingerbread
* changes:
Move native library removal function to helper
Initialize native library path in PackageSetting
Jeff Brown [Mon, 13 Sep 2010 00:24:29 +0000 (17:24 -0700)]
am
e740dd0c: am
69206512: Fix some API discrepancies in InputEvent.
Merge commit '
e740dd0c8fde910066f9ddf83b4ab094ed95eaf9'
* commit '
e740dd0c8fde910066f9ddf83b4ab094ed95eaf9':
Fix some API discrepancies in InputEvent.
Jeff Brown [Mon, 13 Sep 2010 00:21:18 +0000 (17:21 -0700)]
am
69206512: Fix some API discrepancies in InputEvent.
Merge commit '
692065128e66de77470de2c50ead2bef0452952a' into gingerbread-plus-aosp
* commit '
692065128e66de77470de2c50ead2bef0452952a':
Fix some API discrepancies in InputEvent.
Jeff Brown [Mon, 13 Sep 2010 00:15:19 +0000 (17:15 -0700)]
am
0f0541e4: am
b88102f5: Input dispatcher ANR handling enhancements.
Merge commit '
0f0541e40cfef51eb5c3769e53c1aa853b53aaf6'
* commit '
0f0541e40cfef51eb5c3769e53c1aa853b53aaf6':
Input dispatcher ANR handling enhancements.
Jeff Brown [Mon, 13 Sep 2010 00:05:38 +0000 (17:05 -0700)]
am
b88102f5: Input dispatcher ANR handling enhancements.
Merge commit '
b88102f5b7e51552a3576cf197b4c8cf96f193d1' into gingerbread-plus-aosp
* commit '
b88102f5b7e51552a3576cf197b4c8cf96f193d1':
Input dispatcher ANR handling enhancements.
Jeff Brown [Wed, 8 Sep 2010 18:49:43 +0000 (11:49 -0700)]
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
Adam Powell [Sun, 12 Sep 2010 21:19:46 +0000 (14:19 -0700)]
Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture"
Joe Onorato [Sun, 12 Sep 2010 21:07:04 +0000 (14:07 -0700)]
Merge "Connect my plumbing to dsandler's awesome lights out mode."
Romain Guy [Sun, 12 Sep 2010 21:01:08 +0000 (14:01 -0700)]
am
7d5c0e66: am
15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '
7d5c0e660e52888f986acef2cecde8ddc9ca26c8'
* commit '
7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
fix typo in comment @beamsOverlap
Brad Fitzpatrick [Sun, 12 Sep 2010 20:55:18 +0000 (13:55 -0700)]
resolved conflicts for merge of
171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
Adam Powell [Sun, 12 Sep 2010 20:14:16 +0000 (13:14 -0700)]
Merge "resolved conflicts for merge of
12e08f3a to master"
Romain Guy [Sun, 12 Sep 2010 20:03:42 +0000 (13:03 -0700)]
Merge "Optimize calls to glCopyTexImage2D()."
Adam Powell [Sun, 12 Sep 2010 19:47:04 +0000 (12:47 -0700)]
resolved conflicts for merge of
12e08f3a to master
Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
Romain Guy [Sun, 12 Sep 2010 19:25:13 +0000 (12:25 -0700)]
Merge "Correct implementation of saveLayer()."
Romain Guy [Sun, 12 Sep 2010 19:01:54 +0000 (12:01 -0700)]
am
15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '
15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp
* commit '
15f0a79a81fd18211603587bcd46eee0e37ced4d':
fix typo in comment @beamsOverlap
Romain Guy [Sun, 12 Sep 2010 18:42:49 +0000 (11:42 -0700)]
Merge "fix typo in comment @beamsOverlap"
Brad Fitzpatrick [Sun, 12 Sep 2010 18:03:48 +0000 (11:03 -0700)]
am
11fe181e: Add faster TextUtil function for searching delimited lists.
Merge commit '
11fe181e16501103d7c0f70344661ea2ef5d3df9' into gingerbread-plus-aosp
* commit '
11fe181e16501103d7c0f70344661ea2ef5d3df9':
Add faster TextUtil function for searching delimited lists.
Adam Powell [Sun, 12 Sep 2010 17:28:50 +0000 (10:28 -0700)]
am
26cab064: Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread
Merge commit '
26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp
* commit '
26cab06472badee374ac854f5a210991c37c4493':
Allow two finger pan and scale on touchscreens with
Adam Powell [Sun, 12 Sep 2010 17:25:55 +0000 (10:25 -0700)]
Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:59:29 +0000 (08:59 -0700)]
am
ec06144c: am
36edb202: Merge "Make DRM libraries optional"
Merge commit '
ec06144c9ddd5eb06ab77b885bc5312e74b38415'
* commit '
ec06144c9ddd5eb06ab77b885bc5312e74b38415':
Make DRM libraries optional
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:57:07 +0000 (08:57 -0700)]
am
36edb202: Merge "Make DRM libraries optional"
Merge commit '
36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp
* commit '
36edb2028acf9f876a288a49a66bc749b28e64c1':
Make DRM libraries optional
Romain Guy [Sun, 12 Sep 2010 15:47:40 +0000 (08:47 -0700)]
am
405f537a: am
89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '
405f537a47df7ea0c2ef95fd83dee0142eb0c108'
* commit '
405f537a47df7ea0c2ef95fd83dee0142eb0c108':
Fix the layouting of the checkbox.
Romain Guy [Sun, 12 Sep 2010 15:44:37 +0000 (08:44 -0700)]
am
89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '
89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp
* commit '
89e05fd560e3347070a55260b7aaec3db5647442':
Fix the layouting of the checkbox.
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:43:53 +0000 (08:43 -0700)]
am
fe1d52d5: resolved conflicts for merge of
01937f63 to gingerbread-plus-aosp
Merge commit '
fe1d52d572a750d548d7f573b3e4cac8cc08712f'
* commit '
fe1d52d572a750d548d7f573b3e4cac8cc08712f':
Memory leak in TextKeyListener.
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:42:48 +0000 (08:42 -0700)]
Merge "Make DRM libraries optional"
Jean-Baptiste Queru [Sun, 12 Sep 2010 15:34:54 +0000 (08:34 -0700)]
resolved conflicts for merge of
01937f63 to gingerbread-plus-aosp
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
Romain Guy [Sat, 11 Sep 2010 21:06:07 +0000 (14:06 -0700)]
Merge "Fix the layouting of the checkbox."
Romain Guy [Sat, 11 Sep 2010 21:03:11 +0000 (14:03 -0700)]
Merge "Memory leak in TextKeyListener."
Chet Haase [Sat, 11 Sep 2010 00:45:03 +0000 (17:45 -0700)]
Merge "Make fragment animations work when fragments go away"
Winson Chung [Sat, 11 Sep 2010 00:25:44 +0000 (17:25 -0700)]
Merge "-> Fixing some layout issues in StackView -> Made the highlight width depend on the screen density"
Jean-Baptiste Queru [Sat, 11 Sep 2010 00:24:34 +0000 (17:24 -0700)]
am
b387571c: am
ca6de93a: Merge "Fix number counter will keep going after window losed focus."
Merge commit '
b387571c42aa08b5b9aa9833edb94c16a623e535'
* commit '
b387571c42aa08b5b9aa9833edb94c16a623e535':
Fix number counter will keep going after window losed focus.
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:39:35 +0000 (16:39 -0700)]
am
ca6de93a: Merge "Fix number counter will keep going after window losed focus."
Merge commit '
ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp
* commit '
ca6de93a9d2f11a18187d9fcd54303813c06094a':
Fix number counter will keep going after window losed focus.
Jaikumar Ganesh [Fri, 10 Sep 2010 23:23:24 +0000 (16:23 -0700)]
am
b9871461: am
e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread
Merge commit '
b987146123879217a6cdcdfeffdddd917edb22cc'
* commit '
b987146123879217a6cdcdfeffdddd917edb22cc':
Register ServiceStateChanged to CallManager.
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:23:17 +0000 (16:23 -0700)]
am
03821dc6: am
962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."
Merge commit '
03821dc6ea9f96e2b420ab327b727fdcefd880d3'
* commit '
03821dc6ea9f96e2b420ab327b727fdcefd880d3':
Allow two SurfaceViews inbetween the app and the wallpaper.
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:22:27 +0000 (16:22 -0700)]
am
d77b0dfd: am
7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager"
Merge commit '
d77b0dfdf364ed2fabd9d7a2b26d54e34fce0855'
* commit '
d77b0dfdf364ed2fabd9d7a2b26d54e34fce0855':
Make sure OutOfMemoryError is handled by WallpaperManager
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:13:13 +0000 (16:13 -0700)]
Merge "Fix number counter will keep going after window losed focus."
Brad Fitzpatrick [Fri, 10 Sep 2010 23:05:13 +0000 (16:05 -0700)]
Merge "Fix build caused by automerger and missing imports in "
Amith Yamasani [Fri, 10 Sep 2010 23:01:40 +0000 (16:01 -0700)]
Merge "SearchView API"
Jaikumar Ganesh [Fri, 10 Sep 2010 23:01:19 +0000 (16:01 -0700)]
am
e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread
Merge commit '
e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp
* commit '
e442fb6c9215fc6329522915805a9582ec2c3323':
Register ServiceStateChanged to CallManager.
Jaikumar Ganesh [Fri, 10 Sep 2010 22:54:19 +0000 (15:54 -0700)]
Merge "Register ServiceStateChanged to CallManager." into gingerbread
Jean-Baptiste Queru [Fri, 10 Sep 2010 22:47:34 +0000 (15:47 -0700)]
am
962e4826: Merge "Allow two SurfaceViews inbetween the app and the wallpaper."
Merge commit '
962e482606e3f8f8c0b8e540888eaef56a1c8603' into gingerbread-plus-aosp
* commit '
962e482606e3f8f8c0b8e540888eaef56a1c8603':
Allow two SurfaceViews inbetween the app and the wallpaper.
Jean-Baptiste Queru [Fri, 10 Sep 2010 22:47:27 +0000 (15:47 -0700)]
am
7c65585f: Merge "Make sure OutOfMemoryError is handled by WallpaperManager"
Merge commit '
7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp
* commit '
7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
Make sure OutOfMemoryError is handled by WallpaperManager
Adam Powell [Fri, 10 Sep 2010 22:43:08 +0000 (15:43 -0700)]
Merge "Allow the theme to affect action bar menus"
Gilles Debunne [Fri, 10 Sep 2010 22:07:33 +0000 (15:07 -0700)]
am
ddea348d: am
e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread
Merge commit '
ddea348daaa0f72fb0aabb4843f9d6af9457efa0'
* commit '
ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
Changed menu and expandedMenu background color to dark.
Brad Fitzpatrick [Fri, 10 Sep 2010 22:07:20 +0000 (15:07 -0700)]
am
37fc8cc7: am
b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread
Merge commit '
37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd'
* commit '
37fc8cc7b87133eddacaeab60cabefaf4a7b9bdd':
Enable strictmode logging in system_server & add a lock.
Jesse Wilson [Fri, 10 Sep 2010 22:06:54 +0000 (15:06 -0700)]
am
30f163e4: am
86333015: Merge "Delete AWT from frameworks/base." into gingerbread
Merge commit '
30f163e4d9c4f75c3493200c29f8f333ab3de07b'
* commit '
30f163e4d9c4f75c3493200c29f8f333ab3de07b':
Delete AWT from frameworks/base.
Joe Onorato [Fri, 10 Sep 2010 22:06:40 +0000 (15:06 -0700)]
am
38f75b97: (-s ours) am
58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE
Merge commit '
38f75b97d92508633c69eb6461efd353a61dab96'
* commit '
38f75b97d92508633c69eb6461efd353a61dab96':
This was already deprecated, but not picked up by the tool DO NOT MERGE
Jean-Michel Trivi [Fri, 10 Sep 2010 22:06:38 +0000 (15:06 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Nipun Kwatra [Fri, 10 Sep 2010 22:04:17 +0000 (15:04 -0700)]
Merge "Adding hasProfile."
Eric Fischer [Fri, 10 Sep 2010 22:02:41 +0000 (15:02 -0700)]
am
e7be8e8f: (-s ours) am
b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
e7be8e8f6c3db50df8e755033cd110aabd1143df'
* commit '
e7be8e8f6c3db50df8e755033cd110aabd1143df':
Import revised translations. DO NOT MERGE
Brett Chabot [Fri, 10 Sep 2010 22:02:01 +0000 (15:02 -0700)]
am
0194eeab: am
4940ff85: Update to new ddmlib-prebuilt api.
Merge commit '
0194eeabfe2cef825f3e91144529be6644ef84c0'
* commit '
0194eeabfe2cef825f3e91144529be6644ef84c0':
Update to new ddmlib-prebuilt api.
Xavier Ducrohet [Fri, 10 Sep 2010 22:01:56 +0000 (15:01 -0700)]
am
fa888784: am
89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit '
fa8887848e2877dd96e853dfcd52086f1b66c26b'
* commit '
fa8887848e2877dd96e853dfcd52086f1b66c26b':
Avoid pre-processing images when they won't be used
Jean-Baptiste Queru [Fri, 10 Sep 2010 22:01:50 +0000 (15:01 -0700)]
Jean-Baptiste Queru [Fri, 10 Sep 2010 22:00:34 +0000 (15:00 -0700)]
OSDN Git Service
