aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Fix an NPE.Jean Chalard2014-10-141-1/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17958289 Change-Id: I5c9ea668ff75b38c7ddebd767c36a950835c0c9f
* | | | | | am cbd59e02: Merge "Don\'t restore debug preferences"Sandeep Siddhartha2014-10-143-12/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cbd59e02a97dac53ec97f59c1a638bc421ba4a52': Don't restore debug preferences
| * | | | | Merge "Don't restore debug preferences"Sandeep Siddhartha2014-10-143-12/+35
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Don't restore debug preferencesSandeep Siddhartha2014-10-133-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17942814 Change-Id: I0bbef716dff47ed8eb880209d448629ad853b904
* | | | | | am 59f5988a: Merge "Cleanup LoginAccountUtils"Sandeep Siddhartha2014-10-141-10/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59f5988a16bfd979f748ecd356b528f0b933a42c': Cleanup LoginAccountUtils
| * | | | | Merge "Cleanup LoginAccountUtils"Sandeep Siddhartha2014-10-141-10/+16
| |\ \ \ \ \
| | * | | | | Cleanup LoginAccountUtilsSandeep Siddhartha2014-10-131-10/+16
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17464068 Change-Id: Icf994a7582491afebc5db522c127a30d079ce05c
| * | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-132-2/+2
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-132-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie47de03c285de6dcaa6dc9b86dcf027f1c55825f Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-135-19/+19
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-135-19/+19
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7dbac96009086e57a4f3199f86aa6340022e44cc Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-131-1/+1
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64b846864646430dccaf5f58f788b5c5cb485970 Auto-generated-cl: translation import
| * | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-10-133-43/+43
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-133-43/+43
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f02b34c3de602cc6ebe04e1859b31d08b0e95a3 Auto-generated-cl: translation import
| * / / / / Import translations. DO NOT MERGEGeoff Mendal2014-10-132-32/+32
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Ic263dcea659b3133f5ebd7666f7d1c702a4ebddc Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleGeoff Mendal2014-10-131-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c78be329b4ac88d1a74c814aa2a23ad0f608adc Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-134-11/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I274ecd1d6c5c26aaa75abff4129b0e082369d5c7 Auto-generated-cl: translation import
* | | | | am d9015233: Set up a sync preference and policy for syncing [2]Sandeep Siddhartha2014-10-105-73/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd9015233f50724294bb408f1c56715a581dc4bed': Set up a sync preference and policy for syncing [2]
| * | | | Set up a sync preference and policy for syncing [2]Sandeep Siddhartha2014-10-105-73/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds a preference for enabling sync, which controls the sync behavior - Make the ProductionFlags depend on appropriate flags to guarantee that we don't mess things when flipping some flags - Preferences now control the "syncable" property of the provider thereby controlling the policy and when this entry shows up in system settings. Bug: 17464069 Change-Id: I1d58351188518c1ae9f1f9e147b5ea15d32a3427
* | | | | am 1e10d29b: Don\'t restore device specific preferencesSandeep Siddhartha2014-10-106-30/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '1e10d29bc8975ea45ca5e3bdf1936aa418161bcb': Don't restore device specific preferences
| * | | | Don't restore device specific preferencesSandeep Siddhartha2014-10-106-30/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two categories of preferences: 1. That are part of the default shared preference They were all getting backed up and restored. Added a blacklist to not restore some of these. e.g. current account 2. That are in a non-default shared preference file. These are not getting backed up currently, but added a specific local preference file for all such preferences. Bug: 17288591 Change-Id: I2f748be971a2337543e5014434aa39313fd1e1d8
* | | | | am 6e565332: Merge "Fixing keyboard theme selection"Tadashi G. Takaoka2014-10-101-8/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '6e565332df385d67d58543879f9d81263e667c06': Fixing keyboard theme selection
| * | | | Merge "Fixing keyboard theme selection"Tadashi G. Takaoka2014-10-101-8/+10
| |\ \ \ \
| | * | | | Fixing keyboard theme selectionTadashi G. Takaoka2014-10-101-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17937287 Change-Id: I476045980843c5897820cd544daea06fa991acb5
* | | | | | am 7d5e1cb2: [ML23] Introduce a different accuracy/performance tradeoffJean Chalard2014-10-102-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d5e1cb2650d74816767c085ad71d04d6e605559': [ML23] Introduce a different accuracy/performance tradeoff
| * | | | | [ML23] Introduce a different accuracy/performance tradeoffJean Chalard2014-10-102-1/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 11230254 Change-Id: Ic09518c818ae7b68942b1c63160dd462e5922cb5
* | | | | am 5d2d852e: [ML22] Improve the language on spacebar for SLSJean Chalard2014-10-101-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '5d2d852eb0caaf7416c159f83d51e07b1ca87e30': [ML22] Improve the language on spacebar for SLS
| * | | | [ML22] Improve the language on spacebar for SLSJean Chalard2014-10-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11230254 Change-Id: Ib54be1a2a77b6e80cdff1af89a7b4203ea859716
* | | | | am 701b14ff: Merge "Make SuggestionWordInfo non-final for testabilty"Jatin Matani2014-10-101-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '701b14ffa604df48bdc5c6287c9ba296ef8a02db': Make SuggestionWordInfo non-final for testabilty
| * | | | Merge "Make SuggestionWordInfo non-final for testabilty"Jatin Matani2014-10-101-1/+2
| |\ \ \ \
| | * | | | Make SuggestionWordInfo non-final for testabiltyJatin Matani2014-10-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for ag/563043 Bug:17731683 Change-Id: I4d19e512a311547204f7e8d7885fc886757a18b7
* | | | | | am fee22c2a: Fix asset nameTadashi G. Takaoka2014-10-105-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fee22c2aaf3f6114848c40a7e6f1feca045feb48': Fix asset name
| * | | | | Fix asset nameTadashi G. Takaoka2014-10-105-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7a2609af13c3ed7e6333a6af87cb113addd82f34
* | | | | | am 80f0e89a: Remove UsedForTesting tags from BlockingHttpClientSandeep Siddhartha2014-10-101-16/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '80f0e89aaf1a3e7063bb4e9c3b930b6d7e460a6c': Remove UsedForTesting tags from BlockingHttpClient
| * | | | | Remove UsedForTesting tags from BlockingHttpClientSandeep Siddhartha2014-10-091-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17464069 Change-Id: I45aa6da0e339ffb56de613c2a0a43fe37fb2defd
* | | | | | am eaf517ff: Merge "Changes related Sync Engine library that communicates to ↵Jatin Matani2014-10-094-24/+125
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cloud server" * commit 'eaf517ffea7f700a4249eac5c61837fd101320a7': Changes related Sync Engine library that communicates to cloud server
| * | | | | Merge "Changes related Sync Engine library that communicates to cloud server"Jatin Matani2014-10-094-24/+125
| |\ \ \ \ \
| | * | | | | Changes related Sync Engine library that communicates to cloud serverJatin Matani2014-10-094-24/+125
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change updates some of the code that the library uses to communicate with the cloud server Specifically : - Update BlockingHttpClient to use template ResponseProcessor - Update HttpUrlConnectionBuilder to setAuthToken for HttpUrlConnection Bug: 17464069 Bug: 17464805 Change-Id: I7d7b58dff594b920162f799d102e8582ff9fe6a4
* | | | | | am bc180059: Always show the typed word in recorrections.Jean Chalard2014-10-096-60/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc18005948c3872a96bd3406e7dd2c722d60a013': Always show the typed word in recorrections.
| * | | | | Always show the typed word in recorrections.Jean Chalard2014-10-096-60/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11330140 Bug: 17875601 Bug: 17623275 Change-Id: Ie4620f36f312c54c7b01b5f6cbdb0bc9171b6179
* | | | | | am 41302021: Merge "Rename updateCounter to ↵Keisuke Kuroyanagi2014-10-091-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateEntriesForWordWithNgramContext." * commit '41302021d61d3c876fe3952089ff211bab0abb4e': Rename updateCounter to updateEntriesForWordWithNgramContext.
| * | | | | Merge "Rename updateCounter to updateEntriesForWordWithNgramContext."Keisuke Kuroyanagi2014-10-091-3/+2
| |\ \ \ \ \
| | * | | | | Rename updateCounter to updateEntriesForWordWithNgramContext.Keisuke Kuroyanagi2014-10-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Id9b0dd7e32c711ed4292981517c3febd5fe9e897
* | | | | | | am fca049a4: Merge "Extend jni method to dump ngram entries."Keisuke Kuroyanagi2014-10-092-16/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fca049a4b01a92f2f59d790898f8aedb13ad7e7d': Extend jni method to dump ngram entries.
| * | | | | | Merge "Extend jni method to dump ngram entries."Keisuke Kuroyanagi2014-10-092-16/+27
| |\| | | | |
| | * | | | | Extend jni method to dump ngram entries.Keisuke Kuroyanagi2014-10-092-16/+27
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Ib03b58525fae12f254b45630bee31ecbdde227b1
* | | | | | am 65473118: Merge "Simplify CursorAnchorInfoCompatWrapper"Yohei Yukawa2014-10-094-100/+145
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '65473118655817c7f5382d91c7c4e3d734262a3a': Simplify CursorAnchorInfoCompatWrapper
| * | | | | Merge "Simplify CursorAnchorInfoCompatWrapper"Yohei Yukawa2014-10-094-100/+145
| |\ \ \ \ \