aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* am eee0baad: am 76cffec7: Show "navigate up" icon on settings activityTadashi G. Takaoka2014-07-292-11/+34
|\ | | | | | | | | * commit 'eee0baad2e7ac239cda55e675faaebd9642c21d3': Show "navigate up" icon on settings activity
| * Show "navigate up" icon on settings activityTadashi G. Takaoka2014-07-292-11/+34
| | | | | | | | | | Bug: 15813742 Change-Id: I8b1feb5c35377e62199e5a909640d9c50f970654
* | am af6cfb36: am 8ca3eb67: Merge "Update Material icons and backgrounds" into ↵Tadashi G. Takaoka2014-07-2978-12/+7
|\| | | | | | | | | | | | | lmp-dev * commit 'af6cfb36cf15883022a527a3d47f53c18c259041': Update Material icons and backgrounds
| * Merge "Update Material icons and backgrounds" into lmp-devTadashi G. Takaoka2014-07-2478-12/+7
| |\
| | * Update Material icons and backgroundsTadashi G. Takaoka2014-07-2978-12/+7
| | | | | | | | | | | | | | | Bug: 16143083 Change-Id: I6396f725b30e9ef6fa7964a0c9d7eb6d1d97e376
* | | am 5e6431ce: am c6862ee6: Merge "Allow adding ↵Keisuke Kuroyanagi2014-07-294-7/+6
|\| | | | | | | | | | | | | | | | | | | | DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev * commit '5e6431ce32e27d2cdc9e05ea24a7005a3c541386': Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
| * | Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-devKeisuke Kuroyanagi2014-07-254-7/+6
| |\ \ | | |/ | |/|
| | * Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.Keisuke Kuroyanagi2014-07-284-7/+6
| | | | | | | | | | | | | | | Bug: 12725817 Change-Id: Ib9b30473ba94242a7b97ccd3b850068f596a5d17
* | | am b6a75d10: am 036b83f4: Merge "Wait for an event before actually realizing ↵Jean Chalard2014-07-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | it" into lmp-dev * commit 'b6a75d10de3ab43dcf318fde77e81918fc55e02b': Wait for an event before actually realizing it
| * | Merge "Wait for an event before actually realizing it" into lmp-devJean Chalard2014-07-251-1/+1
| |\ \
| | * | Wait for an event before actually realizing itJean Chalard2014-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This would wrongly emit a 'timeout' log entry when switching between two instances of the same language. Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e
* | | | am 5fc43eb0: am 1e491d90: Merge "Use fragment for advanced preference ↵Tadashi G. Takaoka2014-07-285-234/+304
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | screen" into lmp-dev * commit '5fc43eb04df9870fb6256d8d3918e7d399ca8a79': Use fragment for advanced preference screen
| * | | Merge "Use fragment for advanced preference screen" into lmp-devTadashi G. Takaoka2014-07-245-234/+304
| |\ \ \
| | * | | Use fragment for advanced preference screenTadashi G. Takaoka2014-07-285-234/+304
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16522808 Change-Id: If4a2ad7a7dfecc7019bf78ad37d93fa8f37cf21e
* | | | | am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns ↵Keisuke Kuroyanagi2014-07-281-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null." into lmp-dev * commit '0bad998c52cc0ed610e4fef745c438472f14a7e4': Fix NPE when context.getFilesDir() returns null.
| * | | | Merge "Fix NPE when context.getFilesDir() returns null." into lmp-devKeisuke Kuroyanagi2014-07-241-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix NPE when context.getFilesDir() returns null.Keisuke Kuroyanagi2014-07-281-0/+1
| | | |/ | | |/| | | | | | | | | | | | | Bug: 16416948 Change-Id: I0fac5ab26d6efbadbd688d033a79f6705e0161a5
* | | | am 1f5881b7: am 9ba85413: Merge "Refactor Debug settings to use ↵Tadashi G. Takaoka2014-07-284-268/+289
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | SubScreenFragment" into lmp-dev * commit '1f5881b752b9b8e527b00e14150cfedd916513ce': Refactor Debug settings to use SubScreenFragment
| * | | Merge "Refactor Debug settings to use SubScreenFragment" into lmp-devTadashi G. Takaoka2014-07-244-268/+289
| |\ \ \
| | * | | Refactor Debug settings to use SubScreenFragmentTadashi G. Takaoka2014-07-284-268/+289
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16522808 Change-Id: I741e2fbc5f0a62c7d4ae00e603eef52cc2a6d086
* | | | | am b1067103: am 633f1a5e: Merge "Use fragment for text correction preference ↵Tadashi G. Takaoka2014-07-285-126/+203
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen" into lmp-dev * commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86': Use fragment for text correction preference screen
| * | | | Merge "Use fragment for text correction preference screen" into lmp-devTadashi G. Takaoka2014-07-245-126/+203
| |\| | |
| | * | | Use fragment for text correction preference screenTadashi G. Takaoka2014-07-285-126/+203
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16522808 Change-Id: Ia8ce83b0e69cc8157f7b8cefcfeb863eb85ee4b4
* | | | | am f63a044c: am a484dc84: Merge "Use fragment for gesture typing preference ↵Tadashi G. Takaoka2014-07-285-32/+96
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen" into lmp-dev * commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae': Use fragment for gesture typing preference screen
| * | | | Merge "Use fragment for gesture typing preference screen" into lmp-devTadashi G. Takaoka2014-07-245-32/+96
| |\| | |
| | * | | Use fragment for gesture typing preference screenTadashi G. Takaoka2014-07-285-32/+96
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16522808 Change-Id: Ib8c2997466bb006c6b5d4e980344507b822d0023
* | | | | am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference ↵Tadashi G. Takaoka2014-07-286-53/+133
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | screen" into lmp-dev * commit 'beffde59c36515f77946b35c2b0279413a1df69f': Use fragment for multi lingual preference screen
| * | | | Merge "Use fragment for multi lingual preference screen" into lmp-devTadashi G. Takaoka2014-07-246-53/+133
| |\| | |
| | * | | Use fragment for multi lingual preference screenTadashi G. Takaoka2014-07-286-53/+133
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16522808 Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
* | | | | am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-devJean Chalard2014-07-282-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ac82983f65626c1db3fd878ba059807166ffbe36': Fix a verifier error on ICS.
| * | | | Merge "Fix a verifier error on ICS." into lmp-devJean Chalard2014-07-242-4/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix a verifier error on ICS.Jean Chalard2014-07-282-4/+11
| | | |/ | | |/| | | | | | | | | | | | | Bug: 16530557 Change-Id: I271c5884995a1d5f8a1cb7aee6f52d17fabb9e72
* | | | am c140938d: am bfcd98ed: Use fragment for input preference screenTadashi G. Takaoka2014-07-287-56/+276
|\| | | | | | | | | | | | | | | | | | | * commit 'c140938d99b2b34e95d7e45425396f280a486043': Use fragment for input preference screen
| * | | Use fragment for input preference screenTadashi G. Takaoka2014-07-277-56/+276
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This CL introduces a common abstract class, SunScreenFragment, for PreferenceFragment that implements a PreferenceScreen of the main settings preference screen. Bug: 16522808 Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
* | | am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary optionTadashi G. Takaoka2014-07-288-84/+44
|\| | | | | | | | | | | | | | * commit '26a2986581410536a98e1c311214dc90d9934546': Make "Show correction suggestions" as a binary option
| * | Make "Show correction suggestions" as a binary optionTadashi G. Takaoka2014-07-278-84/+44
| |/ | | | | | | | | | | | | | | | | | | | | | | Formerly "Show correction suggestions" had three options, "always show", "show in portrait mode", and "always hide". The reason behind "show in portrait mode" was that there may not be enough screen estate in landscape mode to show suggestions. Because recent phone devices have relatively large screen, we decide to remove "show in portrait mode" option. Bug: 15780939 Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
* | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-07-242-2/+2
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-07-242-2/+2
| | | | | | | | | | | | | | | Change-Id: Id8eadce808d946a7674f41826ab4aa086ac818e7 Auto-generated-cl: translation import
* | | am a270ac4a: Remove unnecessary DebugSettingsActivity, use fragment directlyTadashi G. Takaoka2014-07-246-63/+3
|\ \ \ | |/ / |/| / | |/ | | * commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7': Remove unnecessary DebugSettingsActivity, use fragment directly
| * Remove unnecessary DebugSettingsActivity, use fragment directlyTadashi G. Takaoka2014-07-236-63/+3
| | | | | | | | | | | | | | This CL must be checked in together with I1db2e848ab. Bug: 16522808 Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
* | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-07-2273-2664/+1080
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-07-2273-2664/+1080
| | | | | | | | | | | | | | | Change-Id: I8916526987bd2008b85222124bf465114e4d592c Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-07-224-0/+108
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-224-0/+108
| |/ / | | | | | | | | | | | | Change-Id: I95653f0874ab89771a1aa60cb3a01cb3cfedf01a Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-07-225-70/+35
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-225-70/+35
| |/ / | | | | | | | | | | | | Change-Id: I8ffb44bf95c317dca14df03e5627bd9870acccb5 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-07-225-0/+120
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2014-07-225-0/+120
| |/ / | | | | | | | | | | | | Change-Id: I844a25e74c1cd451523248ae0d09ba9d40c3d09d Auto-generated-cl: translation import
* / / Import translations. DO NOT MERGEBaligh Uddin2014-07-2256-0/+47658
|/ / | | | | | | | | Change-Id: I2f8c16e0dcaf894d2c0acb70c5804969ac618500 Auto-generated-cl: translation import
* / Import translations. DO NOT MERGEBaligh Uddin2014-07-228-602/+302
|/ | | | | Change-Id: Ic1191118d6f8d9dc2bcc6c293c4ffa0f86be34c6 Auto-generated-cl: translation import