Commit Graph

20950 Commits

Author SHA1 Message Date
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
Joe Onorato
209ddbf150 Merge "Connect my plumbing to dsandler's awesome lights out mode." 2010-09-12 14:07:04 -07:00
Romain Guy
7de6490d41 am 7d5c0e66: am 15f0a79a: Merge "fix typo in comment @beamsOverlap"
Merge commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8'

* commit '7d5c0e660e52888f986acef2cecde8ddc9ca26c8':
  fix typo in comment @beamsOverlap
2010-09-12 14:01:08 -07:00
Brad Fitzpatrick
8d7f08b538 resolved conflicts for merge of 171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
2010-09-12 13:55:18 -07:00
Adam Powell
c451fecc23 Merge "resolved conflicts for merge of 12e08f3a to master" 2010-09-12 13:14:16 -07:00
Romain Guy
8e97fe4a7f Merge "Optimize calls to glCopyTexImage2D()." 2010-09-12 13:03:42 -07:00
Adam Powell
3e97393b65 resolved conflicts for merge of 12e08f3a to master
Change-Id: Ic691ec7716d5c450406717d3748847cb9c6b7e82
2010-09-12 12:47:04 -07:00
Romain Guy
95a5043ed8 Merge "Correct implementation of saveLayer()." 2010-09-12 12:25:13 -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
6e2dd9afa6 am ec06144c: am 36edb202: Merge "Make DRM libraries optional"
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'

* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
  Make DRM libraries optional
2010-09-12 08:59:29 -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
d2a53ede47 am 405f537a: am 89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108'

* commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108':
  Fix the layouting of the checkbox.
2010-09-12 08:47:40 -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
10745aabc2 am fe1d52d5: resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp
Merge commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f'

* commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f':
  Memory leak in TextKeyListener.
2010-09-12 08:43:53 -07:00
Jean-Baptiste Queru
2e084394ae Merge "Make DRM libraries optional" 2010-09-12 08:42:48 -07:00