summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 923f2cf0: am a89a059e: am 04104665: Merge change I911458a0 into eclairMarco Nelissen2009-10-291-1/+1
|\ | | | | | | | | | | | | Merge commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b' * commit '923f2cf0dc15ac2bafa8013b31a722b85a64176b': Fix x offset for boxed textures
| * am a89a059e: am 04104665: Merge change I911458a0 into eclairMarco Nelissen2009-10-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'a89a059ea7f4cb3180feaa131eda4713974c3873' into eclair-mr2-plus-aosp * commit 'a89a059ea7f4cb3180feaa131eda4713974c3873': Fix x offset for boxed textures
| | * am 04104665: Merge change I911458a0 into eclairMarco Nelissen2009-10-291-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '04104665271248719cb3659e42938fa4bec0261e' into eclair-mr2 * commit '04104665271248719cb3659e42938fa4bec0261e': Fix x offset for boxed textures
| | | * Merge change I911458a0 into eclairAndroid (Google) Code Review2009-10-281-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * changes: Fix x offset for boxed textures
| | | | * Fix x offset for boxed texturesMarco Nelissen2009-10-281-1/+1
| | | | |
* | | | | am f545e798: am 18eedbac: am a47a1e77: Merge change Ic03d28b9 into eclairSuchi Amalapurapu2009-10-291-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f545e798ebbe7e081c8e87ad32aa450388364bef' * commit 'f545e798ebbe7e081c8e87ad32aa450388364bef': Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
| * | | | am 18eedbac: am a47a1e77: Merge change Ic03d28b9 into eclairSuchi Amalapurapu2009-10-291-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '18eedbacac964f200309f99fdfca06a0a01e5bf5' into eclair-mr2-plus-aosp * commit '18eedbacac964f200309f99fdfca06a0a01e5bf5': Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
| | * | | am a47a1e77: Merge change Ic03d28b9 into eclairSuchi Amalapurapu2009-10-291-1/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0' into eclair-mr2 * commit 'a47a1e77a4dc9510187f57d5cdf12f5ecf6b3ab0': Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces
| | | * | Merge change Ic03d28b9 into eclairAndroid (Google) Code Review2009-10-281-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window.
| | | | * | Check that the window which wants to force hide is visible before setting ↵Suchi Amalapurapu2009-10-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window. This will resolve issues related to current focus and time outs when dispatching key events.
* | | | | | am 29f043d7: am 0fca5b45: am 5e5eb393: Merge change Id572ffc7 into eclairFred Quintana2009-10-291-5/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067' * commit '29f043d7424a0b1314aa5d5d13fb27ef57aef067': don't throw an exception when we can't find a pending sync operation in the database
| * | | | | am 0fca5b45: am 5e5eb393: Merge change Id572ffc7 into eclairFred Quintana2009-10-291-5/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9' into eclair-mr2-plus-aosp * commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9': don't throw an exception when we can't find a pending sync operation in the database
| | * | | | am 5e5eb393: Merge change Id572ffc7 into eclairFred Quintana2009-10-291-5/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2 * commit '5e5eb393729630800079206498f283de8f02f3a7': don't throw an exception when we can't find a pending sync operation in the database
| | | * | | Merge change Id572ffc7 into eclairAndroid (Google) Code Review2009-10-281-5/+6
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: don't throw an exception when we can't find a pending sync operation in the database
| | | | * | | don't throw an exception when we can't find a pending sync operation in the ↵Fred Quintana2009-10-281-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | database
* | | | | | | am 09976caf: am 2b770bbe: am 85ade33e: fix [2071412] work around mdp 32-bits ↵Mathias Agopian2009-10-291-11/+68
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fade limitation Merge commit '09976cafb14944f50ea4b3f7b5e8d5fc831f24ff' * commit '09976cafb14944f50ea4b3f7b5e8d5fc831f24ff': fix [2071412] work around mdp 32-bits fade limitation
| * | | | | | am 2b770bbe: am 85ade33e: fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-291-11/+68
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2b770bbe4697ebea040532f308d63478ee4b9454' into eclair-mr2-plus-aosp * commit '2b770bbe4697ebea040532f308d63478ee4b9454': fix [2071412] work around mdp 32-bits fade limitation
| | * | | | | am 85ade33e: fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-291-11/+68
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e' into eclair-mr2 * commit '85ade33edcc7d9be462ad7b8455d27f6654aca5e': fix [2071412] work around mdp 32-bits fade limitation
| | | * | | | fix [2071412] work around mdp 32-bits fade limitationMathias Agopian2009-10-281-11/+68
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending), we first make a copy of the background into a RGB buffer, then we blend the 32-bits surface as usual (without the alpha component), and finally blend the copy of the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
* | | | | | am cda27c79: (-s ours) am 72c0d293: am 763ccae7: (-s ours) Merge change ↵Christopher Tate2009-10-290-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I8e7f5f07 into eclair Merge commit 'cda27c790adc37804ba1940c027621ab232de1b3' * commit 'cda27c790adc37804ba1940c027621ab232de1b3': DO NOT MERGE: Fix loss of focus after wakeup into incall screen
| * | | | | am 72c0d293: am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclairChristopher Tate2009-10-290-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e' into eclair-mr2-plus-aosp * commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e': DO NOT MERGE: Fix loss of focus after wakeup into incall screen
| | * | | | am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclairChristopher Tate2009-10-290-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-mr2 * commit '763ccae7d734cc7e55772936dc3f101a2bf453d4': DO NOT MERGE: Fix loss of focus after wakeup into incall screen
| | | * | | Merge change I8e7f5f07 into eclairAndroid (Google) Code Review2009-10-281-0/+9
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: DO NOT MERGE: Fix loss of focus after wakeup into incall screen
| | | | * | | DO NOT MERGE: Fix loss of focus after wakeup into incall screenChristopher Tate2009-10-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the asynchronous behavior of keyguard, and incall explicitly disabling keyguard, sometimes the window manager would wind up in a state in which the "correct" app and activity window were shown, but focus was recalculated "too soon," at a time when keyguard was just about gone but not quite, and incall was not yet fully shown. In this case there was no currently valid event target, but the final show of the incall window would not prompt a focus recalculation, so that "no current focus" state would incorrectly persist, resulting in spurious ANRs until some other phone activity forced a focus update. We now detect the problematic case when windows are shown, and make sure to recalculate focus explicitly thereafter. This change does *not* fix the underlying race conditions that have been resulting in mismatched state within the window manager, but it does force a validation pass that puts things in order so that normal operation can continue. Change-Id: I8e7f5f0795f0042a0da074aeed385e3fbc210360
* | | | | | | am 0ae9e101: am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 ↵Scott Main2009-10-291-4/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3' * commit '0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3': docs: add 2.0 video to developer site feature videos
| * | | | | | am e7672d00: am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdkScott Main2009-10-291-4/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01' into eclair-mr2-plus-aosp * commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01': docs: add 2.0 video to developer site feature videos
| | * | | | | am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdkScott Main2009-10-291-4/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-mr2 * commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120': docs: add 2.0 video to developer site feature videos
| | | * | | | am d14f1bd7: Merge change Iacb6e122 into eclair-sdkScott Main2009-10-281-4/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98' into eclair * commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98': docs: add 2.0 video to developer site feature videos
| | | | * \ \ \ Merge change Iacb6e122 into eclair-sdkAndroid (Google) Code Review2009-10-281-4/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: docs: add 2.0 video to developer site feature videos
| | | | | * | | | docs: add 2.0 video to developer site feature videosScott Main2009-10-281-4/+2
| | | | | | | | |
* | | | | | | | | am 524c4e72: am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 ↵Dirk Dougherty2009-10-2911-65/+88
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair-sdk Merge commit '524c4e720d3811230ef9f1707efa280f8f00b851' * commit '524c4e720d3811230ef9f1707efa280f8f00b851': doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| * | | | | | | | am 9ac642a9: am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdkDirk Dougherty2009-10-2911-65/+88
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9ac642a924a85d26fb093a0c4aa0a20817927935' into eclair-mr2-plus-aosp * commit '9ac642a924a85d26fb093a0c4aa0a20817927935': doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| | * | | | | | | am 340fbc36: am 5a4d6696: Merge change Ib80db923 into eclair-sdkDirk Dougherty2009-10-2911-65/+88
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-mr2 * commit '340fbc36fb5ded7819d09d55117917b9a6361fd4': doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| | | * | | | | | am 5a4d6696: Merge change Ib80db923 into eclair-sdkDirk Dougherty2009-10-2811-65/+88
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | / | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | Merge commit '5a4d66965d3c5061d47201fcaa62c90d126e7187' into eclair * commit '5a4d66965d3c5061d47201fcaa62c90d126e7187': doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| | | | * | | | Merge change Ib80db923 into eclair-sdkAndroid (Google) Code Review2009-10-2811-65/+88
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
| | | | | * | | | doc change: some fixes for online sdk docs. update "testing" section of ↵Dirk Dougherty2009-10-2711-65/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screens support doc. Bug: 2160782 Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
* | | | | | | | | am 5647eebc: am 9dba1f92: Merge change Ib482ce88 into eclair-mr2Andreas Huber2009-10-293-13/+151
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314' * commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314': Revive support for video encoding in OMXCodec.
| * | | | | | | | am 9dba1f92: Merge change Ib482ce88 into eclair-mr2Andreas Huber2009-10-293-13/+151
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp * commit '9dba1f928021450f101013e03deacc9a0506772e': Revive support for video encoding in OMXCodec.
| | * | | | | | | Merge change Ib482ce88 into eclair-mr2Android (Google) Code Review2009-10-293-13/+151
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Revive support for video encoding in OMXCodec.
| | | * | | | | | | Revive support for video encoding in OMXCodec.Andreas Huber2009-10-293-13/+151
| | | | | | | | | |
* | | | | | | | | | am cad9a4b0: am 66e06205: Another gcc 4.0.3 workaround.Andy McFadden2009-10-291-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588' * commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588': Another gcc 4.0.3 workaround.
| * | | | | | | | | am 66e06205: Another gcc 4.0.3 workaround.Andy McFadden2009-10-291-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a' into eclair-mr2-plus-aosp * commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a': Another gcc 4.0.3 workaround.
| | * | | | | | | | Another gcc 4.0.3 workaround.Andy McFadden2009-10-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily make a function public that doesn't need to be. When host gcc-4.0.3 is gone from the build servers we can undo this.
* | | | | | | | | | Send a message when the picture changes and find is up to search again.Leon Scroggins2009-10-292-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes http://b/issue?id=2222706 Requires a change in external/webkit. Cherry pick of a change to mr2
* | | | | | | | | | am 1f7253c3: (-s ours) am 5de6389f: DO NOT MERGE. Send a message when the ↵Leon Scroggins2009-10-290-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | picture changes and find is up to search again. Merge commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b' * commit '1f7253c3c27ad604a9b6ad6d1b0a88f4d694a81b': DO NOT MERGE. Send a message when the picture changes and find is up to search again.
| * | | | | | | | | am 5de6389f: DO NOT MERGE. Send a message when the picture changes and find ↵Leon Scroggins2009-10-292-1/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is up to search again. Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp * commit '5de6389f2252cb6e39918e21f80a08918e0c2c02': DO NOT MERGE. Send a message when the picture changes and find is up to search again.
| | * | | | | | | | DO NOT MERGE. Send a message when the picture changes and find is up to ↵Leon Scroggins2009-10-292-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | search again. Fixes http://b/issue?id=2222706 Requires a change in external/webkit. Not merging because the change in webkit should be altered slightly.
* | | | | | | | | | am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2Patrick Scott2009-10-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de' * commit '9ad4274588374df796f7fb9f35d44476fc50c8de': LOG_ASSERT needs a message.
| * | | | | | | | | am 9d73409e: Merge change Ic5e3d73f into eclair-mr2Patrick Scott2009-10-291-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp * commit '9d73409e76000f06a7ee3395241154a029152483': LOG_ASSERT needs a message.
| | * | | | | | | | Merge change Ic5e3d73f into eclair-mr2Android (Google) Code Review2009-10-291-1/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: LOG_ASSERT needs a message.
generated by cgit v1.1 at 2025-11-07 13:01:16 +0000