aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Support landscape orientation for setup wizardTadashi G. Takaoka2013-04-193-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: Ic0f73a7ebfea6e5e98aa320eb1ebc2a677271665
* | | | | | am b3663df5: am 68e4de1e: Add welcome screen to setup wizardTadashi G. Takaoka2013-05-157-2/+265
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b3663df58238cc8e95e9b412964f6e8f43465d70': Add welcome screen to setup wizard
| * | | | | am 68e4de1e: Add welcome screen to setup wizardTadashi G. Takaoka2013-04-197-2/+265
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68e4de1e78c62802fb18be120d58646ca35fe320': Add welcome screen to setup wizard
| | * | | | Add welcome screen to setup wizardTadashi G. Takaoka2013-04-197-2/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preliminary implementation because the welcome screen video is just a placeholder. Bug: 8159728 Change-Id: I6a2459a266babec2f078fc393b18c77b0b7992a8
* | | | | | am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screenTadashi G. Takaoka2013-05-1511-61/+208
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'baa1e14da10fd1ab31780f08ffeb4f186124fc41': Groundwork to implement landscape and welcome screen
| * | | | | am fcefabf9: Groundwork to implement landscape and welcome screenTadashi G. Takaoka2013-04-1911-61/+208
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fcefabf9abafc867ae858160169bb1cd19981e07': Groundwork to implement landscape and welcome screen
| | * | | | Groundwork to implement landscape and welcome screenTadashi G. Takaoka2013-04-1911-61/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
* | | | | | am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"Tadashi G. Takaoka2013-05-155-5/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82a7b185bb8a14e610950548d36fae7a06030236': Add finish action to setup wizard
| * | | | | am 16ec2e11: Merge "Add finish action to setup wizard"Tadashi G. Takaoka2013-04-195-5/+28
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16ec2e1155a0152c6ded42bc8941b90b7cd08d35': Add finish action to setup wizard
| | * | | | Merge "Add finish action to setup wizard"Tadashi G. Takaoka2013-04-195-5/+28
| | |\ \ \ \
| | | * | | | Add finish action to setup wizardTadashi G. Takaoka2013-04-195-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941
| * | | | | | am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" ↵Jean Chalard2013-04-191-8/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'ff078041e7829e1a0d4537c395dad0cf9c4d7f51': Fix an NPE in recorrection
| | * | | | | am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-devJean Chalard2013-04-191-8/+11
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f1dde6a1bf659d182db5a2645515cc1efe74459c': Fix an NPE in recorrection
| * | | | | | | am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" ↵Jean Chalard2013-04-191-2/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit 'e5cbdfe1b83032c6ea212dd95c3968c522baa1d1': Fix an NPE in recapitalize
| | * | | | | | am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-devJean Chalard2013-04-191-2/+5
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '3629605b7c14b5eea498ef9588f4fef788ef454c': Fix an NPE in recapitalize
* | | | | | | | am fc2ca29d: am f10046bd: Remove ScrollView from setup wizardTadashi G. Takaoka2013-05-151-52/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc2ca29d71ef85a93170a7c5f2d61c084a694bb2': Remove ScrollView from setup wizard
| * | | | | | | am f10046bd: Remove ScrollView from setup wizardTadashi G. Takaoka2013-04-181-52/+47
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f10046bddc78c939c53236fb94ebaf413d108b11': Remove ScrollView from setup wizard
| | * | | | | | Remove ScrollView from setup wizardTadashi G. Takaoka2013-04-191-52/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85f089301d1be8ed789a20049d21e2c371cad1c5
* | | | | | | | am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to ↵Tadashi G. Takaoka2013-05-155-54/+88
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style files * commit 'ed0d1156f7c95666b22e10284d8f985a5e83f283': Move some attributes of setup wizard layouts to style files
| * | | | | | | am 30f102e2: Move some attributes of setup wizard layouts to style filesTadashi G. Takaoka2013-04-185-54/+88
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30f102e297d4e4afc28b3aad688fe72e814452e7': Move some attributes of setup wizard layouts to style files
| | * | | | | | Move some attributes of setup wizard layouts to style filesTadashi G. Takaoka2013-04-195-54/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b5999253c959531212ee27ac1ddfe39de280e2c
* | | | | | | | am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted ↵Tadashi G. Takaoka2013-05-152-20/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when activated" * commit 'ae19f170ba511d0bcb7632682b8f9ac45a91ece7': Make setup wizard step number highlighted when activated
| * | | | | | | am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated"Tadashi G. Takaoka2013-04-182-20/+31
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f6e06cf9244cdd8803ee653f948e169c190b067': Make setup wizard step number highlighted when activated
| | * | | | | | Merge "Make setup wizard step number highlighted when activated"Tadashi G. Takaoka2013-04-192-20/+31
| | |\ \ \ \ \ \
| | | * | | | | | Make setup wizard step number highlighted when activatedTadashi G. Takaoka2013-04-192-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I62ccbebaae0a0c4a93ad7c155fc3020a7f357f3c
* | | | | | | | | am 7158438a: am 88ee052c: Merge "Update strings of setup wizard"Tadashi G. Takaoka2013-05-151-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7158438a64d3f224590c484c989251d82b7fb5fa': Update strings of setup wizard
| * | | | | | | | am 88ee052c: Merge "Update strings of setup wizard"Tadashi G. Takaoka2013-04-181-5/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88ee052c10a08bc48f40074583b64e5ebc43fdee': Update strings of setup wizard
| | * | | | | | | Merge "Update strings of setup wizard"Tadashi G. Takaoka2013-04-191-5/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update strings of setup wizardTadashi G. Takaoka2013-04-191-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I34ef461410f4ebd4a3869c3614318581d48fdef5
| | * | | | | | | | am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-04-187-14/+14
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'dcc59297ac97c2ae7791ab09c535927c93c607fb': Import translations. DO NOT MERGE
| * | \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-04-1851-124/+1342
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-1751-124/+1342
| | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie233160cd947ed29aca47db50b67ebb7dfd92337 Auto-generated-cl: translation import
| * | | | | | | | | | am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into ↵Ken Wakasa2013-04-181-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'f02e2693120f84b7d08f059dd9b30eacf838e405': Fix an infinite loop
| | * | | | | | | | | am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-devKen Wakasa2013-04-181-1/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '55b306c9e0ea29a10dfd79d5478344fcc98ca184': Fix an infinite loop
| * | | | | | | | | | | am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at ↵Jean Chalard2013-04-182-5/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onStartInputView * commit '3a18ae70ccdce702478bcb7c7d238373b460b014': Initialize dictionaries at onStartInputView
| | * | | | | | | | | | am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputViewJean Chalard2013-04-182-5/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5d2da82a6a4486a4ef74e51ddd1c875f4c2d935': Initialize dictionaries at onStartInputView
* | | | | | | | | | | | | am 0e64fbbc: am 9cf46864: Update dictionariesJean Chalard2013-05-153-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0e64fbbcac7116c410143796937e4e5ef1238c83': Update dictionaries
| * | | | | | | | | | | | am 9cf46864: Update dictionariesJean Chalard2013-04-183-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cf468646fe3c0ce1ed1b360068dc128f7d9518b': Update dictionaries
| | * | | | | | | | | | | Update dictionariesJean Chalard2013-04-183-0/+0
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | >>> dictionaries/en_GB_wordlist.combined.gz Header : date : 1366021966 <=> 1366272052 Body : Added: yt 0 >>> dictionaries/en_US_wordlist.combined.gz Header : date : 1366021978 <=> 1366272093 Body : Added: yt 0 >>> dictionaries/en_wordlist.combined.gz Header : date : 1366021987 <=> 1366272977 Body : Added: yt 0 >>> dictionaries/fr_wordlist.combined.gz Header : date : 1366003217 <=> 1366272255 Body : Freq changed: cash 80 -> 20 >>> dictionaries/ru_wordlist.combined.gz Header : date : 1366003693 <=> 1366277083 Body : Deleted: толщ 76 >>> java/res/raw/main_en.dict Header : date : 1366021987 <=> 1366272977 Body : Added: yt 0 >>> java/res/raw/main_fr.dict Header : date : 1366003217 <=> 1366272255 Body : Freq changed: cash 80 -> 20 >>> java/res/raw/main_ru.dict Header : date : 1366003693 <=> 1366277083 Body : Deleted: толщ 76 Bug: 8635822 Change-Id: I44dc73bd010b125c994387894847a008276d69f7
* | | | | | | | | | | | am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"Tadashi G. Takaoka2013-05-1526-13/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '64e87b3e660199b5dd7539fe413146e4dfbf977f': Update setup wizard icons
| * | | | | | | | | | | am 0b2d184a: Merge "Update setup wizard icons"Tadashi G. Takaoka2013-04-1726-13/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b2d184a426f49c115ea55098ae6073ccd7d6a94': Update setup wizard icons
| | * | | | | | | | | | Merge "Update setup wizard icons"Tadashi G. Takaoka2013-04-1826-13/+11
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | | * | | | | | | | | Update setup wizard iconsTadashi G. Takaoka2013-04-1826-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: Ia5a14a35292b43dc1eaa2d4edd65134040355149
* | | | | | | | | | | | am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples"Kurt Partridge2013-05-152-20/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8acab80a8680956038b45912d3e00a1d6a5e3cdb': Fix bug in counting words between samples
| * | | | | | | | | | | am 56f35a10: Merge "Fix bug in counting words between samples"Kurt Partridge2013-04-172-20/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '56f35a10cde1beeea51d99427992d832fa2de2bb': Fix bug in counting words between samples
| | * | | | | | | | | | Merge "Fix bug in counting words between samples"Kurt Partridge2013-04-182-20/+23
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix bug in counting words between samplesKurt Partridge2013-04-172-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously MainLogBuffer#shiftOutWords() assumed it wouldn't be called if mNumWordsUntilSafeToSample was 0. This relaxes this assumption (which is in fact false in the current code). Change-Id: I8723248095e84a0d9d6f4639b4742cc7dda9716b
| | * | | | | | | | | | | am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge "Import translations. ↵Baligh Uddin2013-04-1753-1590/+0
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE" * commit '97aa9c4059c41395b6ad550a3e8dfb4a7b66a83b':
* | | | | | | | | | | | | am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ours) ↵Baligh Uddin2013-05-1553-0/+1590
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle * commit '4e12347e0313279d13a267bd827c025949447743':
* | | | | | | | | | | | | am 40070707: am 7a172175: Merge "Fix user recording dialog"Kurt Partridge2013-05-151-28/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40070707d83fb2a105292a0683fa22a1094e58fe': Fix user recording dialog