summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* 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 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.
* | | | | 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 6dd8a935: am 3fc145aa: Merge change Ie8672184 into eclair-mr2Tom Taylor2009-10-291-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6dd8a9351b651c8e85271660fcb2db80328a7b94' * commit '6dd8a9351b651c8e85271660fcb2db80328a7b94': Add error code column to SMS
| * | | | am 3fc145aa: Merge change Ie8672184 into eclair-mr2Tom Taylor2009-10-291-2/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3fc145aafd4e04875ab3b67fed3429db30e15e48' into eclair-mr2-plus-aosp * commit '3fc145aafd4e04875ab3b67fed3429db30e15e48': Add error code column to SMS
| | * | | Merge change Ie8672184 into eclair-mr2Android (Google) Code Review2009-10-291-2/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add error code column to SMS
| | | * | | Add error code column to SMSTom Taylor2009-10-281-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Also add code to save an error code in the DB.
* | | | | | am 69e73d01: am 102767cd: am d85c4b34: Merge change Idb328ab7 into eclairYing Wang2009-10-291-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '69e73d01e5e883c84422096fb078eced8bb98b68' * commit '69e73d01e5e883c84422096fb078eced8bb98b68': Explicitly specify that online-sdk depends on framework-res.
| * | | | | am 102767cd: am d85c4b34: Merge change Idb328ab7 into eclairYing Wang2009-10-291-0/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '102767cd3be39fd3865be02421fd1763f3ff33d5' into eclair-mr2-plus-aosp * commit '102767cd3be39fd3865be02421fd1763f3ff33d5': Explicitly specify that online-sdk depends on framework-res.
| | * | | | am d85c4b34: Merge change Idb328ab7 into eclairYing Wang2009-10-291-0/+4
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2 * commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35': Explicitly specify that online-sdk depends on framework-res.
| | | * | | Merge change Idb328ab7 into eclairAndroid (Google) Code Review2009-10-271-0/+4
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Explicitly specify that online-sdk depends on framework-res.
| | | | * | | Explicitly specify that online-sdk depends on framework-res.Ying Wang2009-10-271-0/+4
| | | | | | |
| | | * | | | Merge change I882d2eb8 into eclairAndroid (Google) Code Review2009-10-271-3/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: do not merge
| | | | * | | | do not mergeMike Reed2009-10-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the filter when we're scrolling, so we don't degrade the quality http://b/issue?id=2174463&cookieId=2009300052135424 same change (in spirit) in MR2 https://android-git.corp.google.com/g/#change,30860
* | | | | | | | am 9a27909e: am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclairDianne Hackborn2009-10-291-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9a27909e754b8b2623bbc82a931c2930c033cbb1' * commit '9a27909e754b8b2623bbc82a931c2930c033cbb1': Add SDK version for MR1.
| * | | | | | | am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclairDianne Hackborn2009-10-291-2/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp * commit '40946aa20183984fd60f2dbdc7708cf1c5431047': Add SDK version for MR1.
| | * | | | | | am 1f668fff: Merge change Idb13ed9a into eclairDianne Hackborn2009-10-291-2/+11
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2 * commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441': Add SDK version for MR1.
| | | * | | | | Merge change Idb13ed9a into eclairAndroid (Google) Code Review2009-10-271-2/+11
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add SDK version for MR1.
| | | | * | | | | Add SDK version for MR1.Dianne Hackborn2009-10-261-2/+11
| | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | Change-Id: Idb13ed9a35397effbfb72a934a7db5f5a882c79c
* | | | | | | | am d7185d0b: am f5633bc7: Fix test breakage in testNickNameV21().Daisuke Miyakawa2009-10-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd7185d0bd250ff5f006ea94d305539ac7d499977' * commit 'd7185d0bd250ff5f006ea94d305539ac7d499977': Fix test breakage in testNickNameV21().
| * | | | | | | am f5633bc7: Fix test breakage in testNickNameV21().Daisuke Miyakawa2009-10-281-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp * commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b': Fix test breakage in testNickNameV21().
| | * | | | | | Fix test breakage in testNickNameV21().Daisuke Miyakawa2009-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal issue number: 2079082
* | | | | | | | am 33728557: am d95a02c2: Fix test breakage in Zaku. Modification to ↵Daisuke Miyakawa2009-10-291-17/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PhoneNumberUtils included. Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd' * commit '33728557540d9033ff396f7a2ddd4fb304fdedcd': Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
| * | | | | | | am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils ↵Daisuke Miyakawa2009-10-281-17/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | included. Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp * commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54': Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
| | * | | | | | Fix test breakage in Zaku. Modification to PhoneNumberUtils included.Daisuke Miyakawa2009-10-291-17/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag. Internal Issue number: 2217362
* | | | | | | | am aa06a0e0: am 3c828e24: Merge change I9195a354 into eclair-mr2Daisuke Miyakawa2009-10-293-30/+173
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4' * commit 'aa06a0e086d57ad3a0d063dfb5ab2cfb7936e4b4': Add partial support of Android-specific properties.
| * | | | | | | am 3c828e24: Merge change I9195a354 into eclair-mr2Daisuke Miyakawa2009-10-283-30/+173
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp * commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0': Add partial support of Android-specific properties.
| | * | | | | | Merge change I9195a354 into eclair-mr2Android (Google) Code Review2009-10-283-30/+173
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add partial support of Android-specific properties.
| | | * | | | | | Add partial support of Android-specific properties.Daisuke Miyakawa2009-10-293-30/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the near future, all the values which cannot be converted to vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE. Example (Nick name): X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;; All the data are stored ordered by its column name ("data1" - "data15"). Currently the code assumes the max num is 15. Internal Issue number: 2079082
* | | | | | | | | am 473bbd21: am 95240270: Instead of a raw AIDL interface, give DropBox a ↵Dan Egnor2009-10-297-259/+348
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the u Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff' * commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff': Instead of a raw AIDL interface, give DropBox a Java
| * | | | | | | | am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface ↵Dan Egnor2009-10-287-259/+348
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the usual getSyste Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp * commit '952402704a175ba27f6c89dff1ada634c5ce5626': Instead of a raw AIDL interface, give DropBox a Java
| | * | | | | | | Instead of a raw AIDL interface, give DropBox a JavaDan Egnor2009-10-287-259/+348
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the usual getSystemService(DROPBOX_SERVICE) type thing. Update the tests accordingly.
* | | | | | | | am b26ab463: am 10d32a33: Merge change I16dc1411 into eclair-mr2Mike Reed2009-10-283-8/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02' * commit 'b26ab4635555dee35b620ffef2aa53cf242b4b02': add boundary patch
| * | | | | | | am 10d32a33: Merge change I16dc1411 into eclair-mr2Mike Reed2009-10-283-8/+57
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '10d32a338d5400786e784a0d6f51b53acea76b44' into eclair-mr2-plus-aosp * commit '10d32a338d5400786e784a0d6f51b53acea76b44': add boundary patch
| | * | | | | | Merge change I16dc1411 into eclair-mr2Android (Google) Code Review2009-10-283-8/+57
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: add boundary patch
| | | * | | | | | add boundary patchMike Reed2009-10-283-8/+57
| | | | | | | | |
* | | | | | | | | am 9acffe76: am 26d4e539: am 678cdbe5: Fix build.Amith Yamasani2009-10-281-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9acffe7639dd15ea74846a53155088e28581bbe5' * commit '9acffe7639dd15ea74846a53155088e28581bbe5': Fix build.
| * | | | | | | | am 26d4e539: am 678cdbe5: Fix build.Amith Yamasani2009-10-281-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp * commit '26d4e539676346236082ed1d3eccdf078980b7d5': Fix build.
| | * | | | | | | am 678cdbe5: Fix build.Amith Yamasani2009-10-281-2/+2
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937' into eclair-mr2 * commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937': Fix build.
| | | * | | | | | Fix build.Amith Yamasani2009-10-271-2/+2
| | | | | | | | |
* | | | | | | | | am ef204454: am 4ac5066d: am aea1b3b2: Disambiguation between multiple ↵Amith Yamasani2009-10-282-31/+198
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointers and swipe gestures. Merge commit 'ef204454322238ab91cec6358a646e4de7352a95' * commit 'ef204454322238ab91cec6358a646e4de7352a95': Disambiguation between multiple pointers and swipe gestures.
| * | | | | | | | am 4ac5066d: am aea1b3b2: Disambiguation between multiple pointers and swipe ↵Amith Yamasani2009-10-282-31/+198
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gestures. Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp * commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d': Disambiguation between multiple pointers and swipe gestures.
| | * | | | | | | am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.Amith Yamasani2009-10-282-31/+198
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2 * commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d': Disambiguation between multiple pointers and swipe gestures.
| | | * | | | | Disambiguation between multiple pointers and swipe gestures.Amith Yamasani2009-10-272-31/+198
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes quickly touching the screen with two fingers will result in the firmware thinking one finger moved very quickly. This code tries to identify the difference between the two based on velocity of the last N points versus the velocity of the last M points and figure out if there was mostly acceleration or a sudden deceleration. It's still not perfect and very dependent on the touch hardware.
* | | | | | | am e1cba3db: am 9fa7048c: am 6158038a: Merge change I2811f162 into eclairJaikumar Ganesh2009-10-281-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4' * commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4': Add Authentication Type field to the APN settings.