summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am 3ccddf93: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Ib5ce9a829c2afde6f7d727c056c24386c6d639fd
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am 4a243a58: am 2b7c28ce: Merge "Send a broadcast when profile changes" into ↵Makoto Onuki2012-09-132-1/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '4a243a589841db65b8b9d5b5398f7eab506a825a': Send a broadcast when profile changes
| * | | | | am 2b7c28ce: Merge "Send a broadcast when profile changes" into jb-mr1-devMakoto Onuki2012-09-122-1/+19
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2b7c28ce69dd596f986df0932aeb3bd00c52deb2': Send a broadcast when profile changes
| | * | | | Merge "Send a broadcast when profile changes" into jb-mr1-devMakoto Onuki2012-09-122-1/+19
| | |\ \ \ \
| | | * | | | Send a broadcast when profile changesMakoto Onuki2012-09-122-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7148705 Change-Id: I3df22b7fc18a106f221f022f222d8fee566a24af
* | | | | | | am 634d21a3: am a6f9ec00: Skip suffix match if ↵Yorke Lee2012-09-132-22/+95
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mUseStrictPhoneNumberComparison is true * commit '634d21a343cd2b2e7d1cd5e668f4b45da7c59344': Skip suffix match if mUseStrictPhoneNumberComparison is true
| * | | | | | am a6f9ec00: Skip suffix match if mUseStrictPhoneNumberComparison is trueYorke Lee2012-09-122-22/+95
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a6f9ec007fb108f9f82e73bfdaef7ffc5e67cffc': Skip suffix match if mUseStrictPhoneNumberComparison is true
| | * | | | | Skip suffix match if mUseStrictPhoneNumberComparison is trueYorke Lee2012-09-122-22/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't do the suffix match during the phone number lookup match if mUseStrictPhoneNumberComparison is true. Bug: 7000177 Change-Id: I77e60117449cec6c37a9605ba4333a067d02a54c
* | | | | | | am 0394f454: am 6db6c6d7: Change fallback method for contact matchingYorke Lee2012-09-123-17/+58
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '0394f454b6ac76cbecb49f560700164dd3d0148f': Change fallback method for contact matching
| * | | | | | am 6db6c6d7: Change fallback method for contact matchingYorke Lee2012-09-123-17/+58
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '6db6c6d74da066cbbe3e3b5b89caf1ba5626d240': Change fallback method for contact matching
| | * | | | | Change fallback method for contact matchingYorke Lee2012-09-123-17/+58
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the fallback method that is used for contact matching whenever the original query fails to return a result. We previously performed a 7 digit match but this resulted in problems such as false positives when the area code is changed but the last 7 digits of a number are the same. The new fallback method uses the GB method of matching via the SQLite function phone_number_compare_loose. Bug: 7000177 Change-Id: I597b4b9e44ab2c4e4a5381832a3e9dfd0d51cf8f
* | | | | | am a8293416: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit 'a8293416f518a38b94ae6b39efc7490d34f09e85':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-060-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Ib413b5627f3ab9e6fa6d8fc1775da5f12a704b14
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | |\ \ \
* | | | \ \ \ am 28cf87f7: am 4b4404b1: Remove unneeded uses-permissions.Makoto Onuki2012-08-271-7/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '28cf87f74cab38e2c381df1a5fea39fe22af557a': Remove unneeded uses-permissions.
| * | | | | | am 4b4404b1: Remove unneeded uses-permissions.Makoto Onuki2012-08-271-7/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4b4404b1d54dfb8fa8a1f695eefaa33b37f602e4': Remove unneeded uses-permissions.
| | * | | | | Remove unneeded uses-permissions.Makoto Onuki2012-08-271-7/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They used to be needed for the sync adapter, which used to be in the same package. Bug 7061938 Change-Id: I8c7a999dc106432aa69443bfcc47cfb8cfe7e947
* | | | | | am 8397fc6a: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-250-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '8397fc6aaaaeda7a4e0d62b9419cab05ab0b9fd5':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-250-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: Ie51406251152692347f738883ae33a9ba62435fb
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 03252745: am e31a15bc: am 3b1b1d5e: am 7d112d54: Merge "Update ↵Makoto Onuki2012-08-242-349/+349
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HanziToPinyin table and tests." * commit '03252745bc989850168264226ad54bfd59e49f55': Update HanziToPinyin table and tests.
| * | | | | | am e31a15bc: am 3b1b1d5e: am 7d112d54: Merge "Update HanziToPinyin table and ↵Makoto Onuki2012-08-242-349/+349
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests." * commit 'e31a15bcfe67f21320a71758411ba756f1d60f23': Update HanziToPinyin table and tests.
| | * | | | | am 3b1b1d5e: am 7d112d54: Merge "Update HanziToPinyin table and tests."Makoto Onuki2012-08-242-349/+349
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '3b1b1d5e732728ea7d60b408ab03f42e5d9ace8f': Update HanziToPinyin table and tests.
| | | * | | | am 7d112d54: Merge "Update HanziToPinyin table and tests."Makoto Onuki2012-08-242-349/+349
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | * commit '7d112d54a173e6d6172aeeff5fa7dfee4abc2d73': Update HanziToPinyin table and tests.
| | | | * | | Merge "Update HanziToPinyin table and tests."Makoto Onuki2012-08-242-349/+349
| | | | |\ \ \
| | | | | * | | Update HanziToPinyin table and tests.Xiaotao Duan2012-08-242-349/+349
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I160208ede00a4f63b257a0b6cc59ff5ad153960d
* | | | | | | am 2427a855: (-s ours) am 98e25a0b: Import translations. DO NOT MERGEBaligh Uddin2012-08-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2427a85564cd5d00a9c74a8f91e791da9c81b137': Import translations. DO NOT MERGE
| * | | | | | am 98e25a0b: Import translations. DO NOT MERGEBaligh Uddin2012-08-232-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '98e25a0b5e5ca41f051265b0316f4b48c1565d37': Import translations. DO NOT MERGE
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-232-2/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: Ia290b1b3f628e57206a06dbfa91b98c9ea8cc583 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32e8f3821d255d68255360c84fd3d6dfcbb9a43b Auto-generated-cl: translation import
* | | | | | am 58108961: (-s ours) am cbbc0619: Import translations. DO NOT MERGEBaligh Uddin2012-08-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '581089619ae9971213d8c96b693a8444963e6459': Import translations. DO NOT MERGE
| * | | | | am cbbc0619: Import translations. DO NOT MERGEBaligh Uddin2012-08-225-5/+5
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'cbbc06190c8538fa46964ddc205da6971afdd22a': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-225-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57ff1698b4772282df15a909c700f3ee42f78340 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-225-5/+5
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-225-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee4364d4e7f38794417e8c643688b23cdeb3fc97 Auto-generated-cl: translation import
* | | | | | | am 53e73b1f: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-220-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / * commit '53e73b1f6d70d022cede0994fd8d4aab59b37d93':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-220-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | Change-Id: I878ca38cad6efc67ad6b612e5cd8bc93de7e9d8f
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-220-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
* | | | | | am 2e6d182e: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | * commit '2e6d182e09073fe4ddf1ee38fb831a4e50c9e588':
| * | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-08-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Change-Id: I7663718d128bb09e7366d9d375f823fb684c7d59
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | |\ \ \ \
* | | | \ \ \ \ am 0c6bd0af: (-s ours) am 708d6cd0: Import translations. DO NOT MERGEBaligh Uddin2012-08-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c6bd0afc37e1aad37ff9748740eaa87c8fb23fc': Import translations. DO NOT MERGE
| * | | | | | | am 708d6cd0: Import translations. DO NOT MERGEBaligh Uddin2012-08-211-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '708d6cd081d8147626a74bd9882824378ce54e93': Import translations. DO NOT MERGE
| | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-211-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21307be72624fc8aecae9b48ce4888eb9b0722f9 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d0f2a4ff4d94910440800f392c3541a66ed8267 Auto-generated-cl: translation import
* | | | | | | am 7a485ebb: (-s ours) am a97744ee: Import translations. DO NOT MERGEBaligh Uddin2012-08-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7a485ebba9256f9687cc6aa545059dbd35111801': Import translations. DO NOT MERGE