Commit Graph

18083 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Romain Guy
e27f0c736c am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '15f0a79a81fd18211603587bcd46eee0e37ced4d' into gingerbread-plus-aosp

* commit '15f0a79a81fd18211603587bcd46eee0e37ced4d':
  fix typo in comment @beamsOverlap
2010-09-12 12:01:54 -07:00
Romain Guy
b6e06d57e5 Merge "fix typo in comment @beamsOverlap" 2010-09-12 11:42:49 -07:00
Brad Fitzpatrick
06996eb1ec 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.
2010-09-12 11:03:48 -07:00
Adam Powell
2f8d3f0e2a 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
2010-09-12 10:28:50 -07:00
Adam Powell
f76fc380f5 Merge "Allow two finger pan and scale on touchscreens with FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT." into gingerbread 2010-09-12 10:25:55 -07:00
Jean-Baptiste Queru
aa8831d263 am 36edb202: Merge "Make DRM libraries optional"
Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp

* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
  Make DRM libraries optional
2010-09-12 08:57:07 -07:00
Romain Guy
6b6f26013e am 89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp

* commit '89e05fd560e3347070a55260b7aaec3db5647442':
  Fix the layouting of the checkbox.
2010-09-12 08:44:37 -07:00
Jean-Baptiste Queru
2e084394ae Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00
Jean-Baptiste Queru
935dc55ef6 resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
2010-09-12 08:35:04 -07:00
Romain Guy
c3d40e5b94 Merge "Fix the layouting of the checkbox." 2010-09-11 14:06:07 -07:00
Romain Guy
1cca244dfe Merge "Memory leak in TextKeyListener." 2010-09-11 14:03:11 -07:00
Jean-Baptiste Queru
5b792a2bd8 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.
2010-09-10 16:39:35 -07:00
Jean-Baptiste Queru
d7faa10feb Merge "Fix number counter will keep going after window losed focus." 2010-09-10 16:13:13 -07:00
Jaikumar Ganesh
ed35c68ca1 am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread
Merge commit 'e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp

* commit 'e442fb6c9215fc6329522915805a9582ec2c3323':
  Register ServiceStateChanged to CallManager.
2010-09-10 16:01:19 -07:00
Jaikumar Ganesh
8dd3d8442f Merge "Register ServiceStateChanged to CallManager." into gingerbread 2010-09-10 15:54:19 -07:00
Jean-Baptiste Queru
d60e3f4272 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.
2010-09-10 15:47:34 -07:00
Jean-Baptiste Queru
adf78d86d7 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
2010-09-10 15:47:27 -07:00
Jean-Baptiste Queru
a859dedd64 Merge "Allow two SurfaceViews inbetween the app and the wallpaper." 2010-09-10 14:36:21 -07:00
Jean-Baptiste Queru
e5cc71dab6 Merge "Make sure OutOfMemoryError is handled by WallpaperManager" 2010-09-10 14:25:14 -07:00
Gilles Debunne
c7513e6b5d am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp

* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
  Changed menu and expandedMenu background color to dark.
2010-09-10 14:19:50 -07:00
Gilles Debunne
6f4a9a5cc0 Merge "Changed menu and expandedMenu background color to dark." into gingerbread 2010-09-10 14:16:29 -07:00
Brad Fitzpatrick
3d22167858 am b724d251: Merge "Enable strictmode logging in system_server & add a lock." into gingerbread
Merge commit 'b724d2519a900744a477bd57df6a2f8703c87e72' into gingerbread-plus-aosp

* commit 'b724d2519a900744a477bd57df6a2f8703c87e72':
  Enable strictmode logging in system_server & add a lock.
2010-09-10 14:08:58 -07:00
Jesse Wilson
47d5f82186 am 86333015: Merge "Delete AWT from frameworks/base." into gingerbread
Merge commit '863330154e8d42e688ffda02c497f53d8b213a2d' into gingerbread-plus-aosp

* commit '863330154e8d42e688ffda02c497f53d8b213a2d':
  Delete AWT from frameworks/base.
2010-09-10 14:06:10 -07:00
Brad Fitzpatrick
70b429291e Merge "Enable strictmode logging in system_server & add a lock." into gingerbread 2010-09-10 14:05:57 -07:00
Jesse Wilson
b19eac8c26 Merge "Delete AWT from frameworks/base." into gingerbread 2010-09-10 14:04:01 -07:00
Joe Onorato
38a9779ada am 58300000: This was already deprecated, but not picked up by the tool DO NOT MERGE
Merge commit '58300000c1867eaf10fbfb91c53d1b86a37f5b47' into gingerbread-plus-aosp

* commit '58300000c1867eaf10fbfb91c53d1b86a37f5b47':
  This was already deprecated, but not picked up by the tool DO NOT MERGE
2010-09-10 14:03:28 -07:00
Eric Fischer
c957a94068 am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473' into gingerbread-plus-aosp

* commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473':
  Import revised translations.  DO NOT MERGE
2010-09-10 13:21:26 -07:00
Eric Fischer
fcc41ded9e Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-10 13:18:37 -07:00
Brett Chabot
5d2460b6a2 am 4940ff85: Update to new ddmlib-prebuilt api.
Merge commit '4940ff85d561310d2c122ca6bd7de4d00772b095' into gingerbread-plus-aosp

* commit '4940ff85d561310d2c122ca6bd7de4d00772b095':
  Update to new ddmlib-prebuilt api.
2010-09-10 13:03:57 -07:00
Xavier Ducrohet
218d44ea1a am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp

* commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
  Avoid pre-processing images when they won't be used
2010-09-10 13:03:43 -07:00
Jean-Baptiste Queru
bb07c1d782 am beeb71df: fix build
Merge commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2' into gingerbread-plus-aosp

* commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2':
  fix build
2010-09-10 13:03:38 -07:00
Jean-Baptiste Queru
69297e5c07 am 862438eb: fix build
Merge commit '862438eb69297accde289230f4c4623b56a39458' into gingerbread-plus-aosp

* commit '862438eb69297accde289230f4c4623b56a39458':
  fix build
2010-09-10 13:03:33 -07:00
Jean-Baptiste Queru
6813dc9de5 am 7547b8ea: fix build
Merge commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c' into gingerbread-plus-aosp

* commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c':
  fix build
2010-09-10 13:03:29 -07:00
Jean-Baptiste Queru
e0438ec455 am 93548db6: fix build
Merge commit '93548db645dd4fd2b9c1dd270421ac0b38de720e' into gingerbread-plus-aosp

* commit '93548db645dd4fd2b9c1dd270421ac0b38de720e':
  fix build
2010-09-10 13:03:24 -07:00
Joe Onorato
691363f9eb am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread
Merge commit '81fe092d11607912944a49c47df6c14e28a977b8' into gingerbread-plus-aosp

* commit '81fe092d11607912944a49c47df6c14e28a977b8':
  Make @deprecated without a comment an error DO NOT MERGE
2010-09-10 12:49:15 -07:00
Joe Onorato
2d3d72ac1c am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp

* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
  Fix the last remaining @deprecated tag without comment warning.
2010-09-10 12:46:52 -07:00