aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a7c5dcde: Merge "Add Accounts & privacy settings in LatinIME"Sandeep Siddhartha2014-09-189-3/+161
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7c5dcdedf66a4be233e3e4236fa6dabb762f28b': Add Accounts & privacy settings in LatinIME
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add Accounts & privacy settings in LatinIME"Sandeep Siddhartha2014-09-189-3/+161
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Accounts & privacy settings in LatinIMESandeep Siddhartha2014-09-179-3/+161
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also start showing the logging preference on this screen too. This settings screen will be the container for all account management, sync and privacy related settings Bug: 17464068 Change-Id: Ie0806f6e8a542e9dea2834445ff7b38805207bda
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6624ea96: Merge "Pass prevWordCount to native code for getSuggestion."Keisuke Kuroyanagi2014-09-181-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6624ea96f763b083a1eb590411b31b6b2d04d058': Pass prevWordCount to native code for getSuggestion.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Pass prevWordCount to native code for getSuggestion."Keisuke Kuroyanagi2014-09-181-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass prevWordCount to native code for getSuggestion.Keisuke Kuroyanagi2014-09-181-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Id2b49a448982c997e5c0a22445b115e675156c3e
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0055d261: Merge "Fix showing important notice even at beginning of sentence"Tadashi G. Takaoka2014-09-185-18/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0055d26164745b24b83d1cbda6d1b1a1acb36342': Fix showing important notice even at beginning of sentence
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix showing important notice even at beginning of sentence"Tadashi G. Takaoka2014-09-185-18/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix showing important notice even at beginning of sentenceTadashi G. Takaoka2014-09-185-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of Ic72d6fecc3 from lmp-dev. Bug: 17536096 Change-Id: Id76b8f8dc85d03bc7ed5f24800301c081a82a8d2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5dda75b5: Add methods to get a Key\'s horizontal and vertical gaps.David Faden2014-09-181-6/+41
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5dda75b538ee53351fdfd800e0e5a9f329ad7c2e': Add methods to get a Key's horizontal and vertical gaps.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add methods to get a Key's horizontal and vertical gaps.David Faden2014-09-181-6/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record the horizontal and vertical gap for the key, adding corresponding accessors. This info is helpful in interpreting corresponding touch points data. Bug: 17400259 Change-Id: I825c537a48db35baab71580ff5c41cd911094a4b
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am eddfe51b: resolved conflicts for merge of 233a2f21 to masterYohei Yukawa2014-09-1810-415/+264
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eddfe51b38755e0068e3c322868c5e209f212f6f': Use Add-To-Dictionary indicator only
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 233a2f21 to masterYohei Yukawa2014-09-1810-415/+264
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If391cc622367dfb4448c6a5c32b82111d352d86e
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fa63d910: Merge "Use Add-To-Dictionary indicator only" into lmp-devYohei Yukawa2014-09-1810-415/+264
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa63d910950621d820d28b177a9de199e492557c': Use Add-To-Dictionary indicator only
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use Add-To-Dictionary indicator only" into lmp-devYohei Yukawa2014-09-1810-415/+264
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Add-To-Dictionary indicator onlyYohei Yukawa2014-09-1810-415/+264
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this CL, the previously used commit indicator was reverted. Instead we use the add-to-dictionary indicator only at the moment. This CL also fixes the indicator position in bidi context. BUG: 17335734 Change-Id: I5f7cf173ddc30876e2b01320acaff8ba4265edf6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cdabc71c: Merge "Add a Dictionary.isUserSpecific method."Jean Chalard2014-09-181-0/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cdabc71c6da00ea1c2254e13021973c762c79be4': Add a Dictionary.isUserSpecific method.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a Dictionary.isUserSpecific method."Jean Chalard2014-09-181-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a Dictionary.isUserSpecific method.David Faden2014-09-181-0/+18
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the name suggests, returns true if the Dictionary is of a type that may use user-specific data, e.g., contacts. Cherry-pick of I11e71286c7635f50ace156dcc5308dbe51268d4e Change-Id: I08c3f22f0c34eaa71bbd06594314f3b411658c5c
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e7c2d1c9: am 902cefb6: am 97ad4968: am bfabac44: Suppress voice input key ↵Tadashi G. Takaoka2014-09-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on textWebEmailAddress field * commit 'e7c2d1c99c165fac57486d472809dc45f920263c': Suppress voice input key on textWebEmailAddress field
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 902cefb6: am 97ad4968: am bfabac44: Suppress voice input key on ↵Tadashi G. Takaoka2014-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textWebEmailAddress field * commit '902cefb6635053b682a917259eb5a964a17506fd': Suppress voice input key on textWebEmailAddress field
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bfabac44: Suppress voice input key on textWebEmailAddress fieldTadashi G. Takaoka2014-09-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfabac449d0b529ee22887aa198a34fdf04b3beb': Suppress voice input key on textWebEmailAddress field
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress voice input key on textWebEmailAddress fieldTadashi G. Takaoka2014-09-181-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17486589 Change-Id: Ie9bf9266ee423b7e03cebcaa5f522accdd1a7802
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ace9c148: Merge "Use PrevWordsInfo.getPrevWordCount() in Java side."Keisuke Kuroyanagi2014-09-182-20/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ace9c1485251ef63f37e5cde4fc5f6d7620f3386': Use PrevWordsInfo.getPrevWordCount() in Java side.
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use PrevWordsInfo.getPrevWordCount() in Java side."Keisuke Kuroyanagi2014-09-182-20/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PrevWordsInfo.getPrevWordCount() in Java side.Keisuke Kuroyanagi2014-09-172-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14425059 Change-Id: Ie6295ff657c483876af403f2d474b7d857e5e3d6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 90f06760: Fix Romanian keyboard to promote "A with breve"Tadashi G. Takaoka2014-09-181-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '90f06760b917fcd8ce47228c4a541059c0075d72': Fix Romanian keyboard to promote "A with breve"
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Romanian keyboard to promote "A with breve"Tadashi G. Takaoka2014-09-181-2/+2
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17324498 Change-Id: Ie27f0023b2bfb18b0ee2051260ecf6bab75727a5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fc12c0a7: Merge "Add a user preference for split layout within Appearance ↵Jatin Matani2014-09-175-1/+27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | & Layouts" * commit 'fc12c0a7fdb68b0c44a7fdefb67b15c099526f59': Add a user preference for split layout within Appearance & Layouts
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a user preference for split layout within Appearance & Layouts"Jatin Matani2014-09-175-1/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a user preference for split layout within Appearance & LayoutsJatin Matani2014-09-165-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note The preference is flag protected. Change-Id: I1be219ba961f002897b7b13ff9f200e2f142b2d8
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7d64bc34: Merge "Revert "Revert "Fall back to default keyboard theme"""Tadashi G. Takaoka2014-09-174-47/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7d64bc34550e68a2cba502f01d7a8a978a41243b': Revert "Revert "Fall back to default keyboard theme""
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Fall back to default keyboard theme"""Tadashi G. Takaoka2014-09-174-47/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Fall back to default keyboard theme""Tadashi G. Takaoka2014-09-174-47/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 821486ba8b7a8e2d1a8f31846af456faf076d126. Change-Id: If0285c87edcd5f7d3c5449026953a74bf1125f65
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c6cc0008: Merge "Revert "Fall back to default keyboard theme""Tadashi G. Takaoka2014-09-174-67/+47
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c6cc0008922a93d2a320761f97d7758daca0e903': Revert "Fall back to default keyboard theme"
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Fall back to default keyboard theme""Tadashi G. Takaoka2014-09-174-67/+47
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fall back to default keyboard theme"Tadashi G. Takaoka2014-09-174-67/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6ed8b183262063d009e3bb2264e2fe04d780dea3. Change-Id: I48f775e54f4077e556b26bc0146bc918421c6845
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e2a396ee: Merge "Fall back to default keyboard theme"Tadashi G. Takaoka2014-09-174-47/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2a396eef0a68903018a4c578604acc8a1c252db': Fall back to default keyboard theme
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fall back to default keyboard theme"Tadashi G. Takaoka2014-09-174-47/+67
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to default keyboard themeTadashi G. Takaoka2014-09-174-47/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17537884 Change-Id: I3452d6d4a5837c6b2d417c8d256c121df86131cc
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f116f910: Making spelling of the word "distracters" consistentAdrian Velicu2014-09-172-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f116f9103377866c3a1e5d2b03907bbfead2970b': Making spelling of the word "distracters" consistent
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making spelling of the word "distracters" consistentAdrian Velicu2014-09-172-7/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17537869 Change-Id: Ibfc1c84aff72aeb76c9b127503369d00f3dfaceb
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 44398bb5: am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of ↵Tadashi G. Takaoka2014-09-172-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | custom action label key" into lmp-dev * commit '44398bb5e16e5018189dcedfb13c78fe97056667': Fix drawing of custom action label key
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cf5fc1ea: am 4e1f1689: am 5ae05786: Merge "Fix drawing of custom action ↵Tadashi G. Takaoka2014-09-162-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | label key" into lmp-dev * commit 'cf5fc1ea065873cd6d7b1d5d467940e4e45354d3': Fix drawing of custom action label key
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5ae05786: Merge "Fix drawing of custom action label key" into lmp-devTadashi G. Takaoka2014-09-162-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5ae057862e316bac7971d2ec325e57d5ff54c592': Fix drawing of custom action label key
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix drawing of custom action label key" into lmp-devTadashi G. Takaoka2014-09-162-1/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix drawing of custom action label keyTadashi G. Takaoka2014-09-162-1/+7
| | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17488054 Change-Id: I433561ed19ec2a79402867a0395a3e388730f087
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-162-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-152-2/+2
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I893b13ee353d4ce57b34bf8ca4e0e3a5ddc0b068 Auto-generated-cl: translation import
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devBaligh Uddin2014-09-1656-0/+47658
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \