aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3ac40c6a' into jb-mr2-dev-plus-aospBaligh Uddin2013-05-153-18/+12
|\ | | | | | | | | | | | | Conflicts: java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java Conflict resolved by matching code with jb-mr2-dev.
| * am 1641a4a4: Merge "Fix Google spell checker tests"Satoshi Kataoka2013-05-013-22/+12
| |\ | | | | | | | | | | | | * commit '1641a4a4576e73bbf0218178c885f448d669b472': Fix Google spell checker tests
| | * Merge "Fix Google spell checker tests"Satoshi Kataoka2013-05-013-22/+12
| | |\
| | | * Fix Google spell checker testsSatoshi Kataoka2013-05-013-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 8613307 Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
* | | | am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"Tadashi G. Takaoka2013-05-153-22/+49
|\| | | | | | | | | | | | | | | | | | | * commit '6191026ce4e4cc756f47135223f58318d35d3143': Introduce MoreSuggestionsListener class
| * | | am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"Tadashi G. Takaoka2013-05-013-22/+49
| |\| | | | | | | | | | | | | | | | | | * commit '0caf3f6a04a706be6f69309b7d0869bf93accd56': Introduce MoreSuggestionsListener class
| | * | Merge "Introduce MoreSuggestionsListener class"Tadashi G. Takaoka2013-05-013-22/+49
| | |\ \
| | | * | Introduce MoreSuggestionsListener classTadashi G. Takaoka2013-05-013-22/+49
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8694255 Change-Id: I9420a7cb1983c6211f58d13b3b11db4347c3f99b
* | | | | am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"Satoshi Kataoka2013-05-151-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'fcfa2cb24fe4151e28574d3da4397bcc04f3d50a': Add permissions for personalization
| * | | | am 6314b845: Merge "Add permissions for personalization"Satoshi Kataoka2013-05-011-4/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '6314b845f4df3ae66caeef16dd1ac399116eac35': Add permissions for personalization
| | * | | Merge "Add permissions for personalization"Satoshi Kataoka2013-05-011-4/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add permissions for personalizationSatoshi Kataoka2013-05-011-4/+6
| | | |/ | | | | | | | | | | | | | | | | | | | | Bug: 8683365 Change-Id: Ia74d730a6b778c0e647794efc8c3a810c715902c
* | | | am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to ↵Tadashi G. Takaoka2013-05-151-8/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | detect state_pressed" * commit 'f405dc87a8e61fe95c8e4ee5b81a2f4cd005dfd0': Override View.drawableStateChanged to detect state_pressed
| * | | am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"Tadashi G. Takaoka2013-04-301-8/+23
| |\| | | | | | | | | | | | | | | | | | * commit '17a353831ae81ba6155a87693289ca9afd7f89cb': Override View.drawableStateChanged to detect state_pressed
| | * | Override View.drawableStateChanged to detect state_pressedTadashi G. Takaoka2013-05-011-8/+23
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike on JB, View.setPressed(boolean) is never called when the view is pressed on ICS. To detect a pressed state of the view, we need to override View.drawableStateChanged() and check the drawable state contains state_pressed. Bug: 8159728 Change-Id: I481051364d6f3d1370742723c3ce19d898ea5463
* | | am 3b892164: am 7b2114a4: Display still image when device can\'t play ↵Tadashi G. Takaoka2013-05-153-0/+10
|\| | | | | | | | | | | | | | | | | | | | welcome video * commit '3b8921646fb51b9bb91108cfc103a5feccbbbbe9': Display still image when device can't play welcome video
| * | am 7b2114a4: Display still image when device can\'t play welcome videoTadashi G. Takaoka2013-04-303-0/+10
| |\| | | | | | | | | | | | | * commit '7b2114a4283ccd90a937b14145c11125824cd1bd': Display still image when device can't play welcome video
| | * Display still image when device can't play welcome videoTadashi G. Takaoka2013-05-013-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Note that the still image in this change is a placeholder and must be replaced by final asset. Bug: 8159728 Change-Id: I4f5a28e0af711edacbc87c2ee64508f34f67f0da
| * | am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when ↵Jean Chalard2013-04-301-2/+7
| |\| | | | | | | | | | | | | | | | | | | suggestions are off." into jb-mr2-dev * commit '019c38060d8479e26895f94e00fa53586ce28a70': Don't do recorrection when suggestions are off.
| | * am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are ↵Jean Chalard2013-04-301-2/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | off." into jb-mr2-dev * commit 'ace3f3c5d56f5b4a58e8dc400fec1bb8c7b17a63': Don't do recorrection when suggestions are off.
| * | \ Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-04-304-5/+4
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-04-304-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica24d3aa4d4e8ffbcc17f9b206f2683fcfc4daf5 Auto-generated-cl: translation import
* | | | | am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"Ken Wakasa2013-05-152-21/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '761b5586a74f86b269335884fef4ab23eadc69f1': Cleanup an unused return value
| * | | | am a0b62ece: Merge "Cleanup an unused return value"Ken Wakasa2013-04-302-21/+10
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'a0b62ece8383d8fae96287cc333e2165e29d21e0': Cleanup an unused return value
| | * | | Merge "Cleanup an unused return value"Ken Wakasa2013-04-302-21/+10
| | |\ \ \
| | | * | | Cleanup an unused return valueKen Wakasa2013-04-302-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I974964aa3cc24b5480e57bd38c197fe7a49acaa4
* | | | | | am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"Tadashi G. Takaoka2013-05-152-3/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9': Catch error while playing welcome video
| * | | | | am 1187ef9a: Merge "Catch error while playing welcome video"Tadashi G. Takaoka2013-04-302-3/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1187ef9a9747ff2ed71101156f3f560eaa32772c': Catch error while playing welcome video
| | * | | | Merge "Catch error while playing welcome video"Tadashi G. Takaoka2013-04-302-3/+14
| | |\ \ \ \
| | | * | | | Catch error while playing welcome videoTadashi G. Takaoka2013-04-302-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: Ic8eea7993f12395d6eca6db8d5529803251a9fee
* | | | | | | am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"Jean Chalard2013-05-152-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd618419d16865f9cc54ec893873bab514b321815': [PB14] Cosmetic fixes to the progress bar
| * | | | | | am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"Jean Chalard2013-04-302-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '37bbaea8a15038406214fa8c9098cfcf4b2e2d9b': [PB14] Cosmetic fixes to the progress bar
| | * | | | | Merge "[PB14] Cosmetic fixes to the progress bar"Jean Chalard2013-04-302-0/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | [PB14] Cosmetic fixes to the progress barJean Chalard2013-04-302-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7600384 Change-Id: I33ea155c0c97c7ead07686c4d2a9e0d98be9929c
* | | | | | | am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the ↵Satoshi Kataoka2013-05-152-14/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | personal dictionary" * commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685': Fix the title of the fragment of the personal dictionary
| * | | | | | am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"Satoshi Kataoka2013-04-302-14/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2': Fix the title of the fragment of the personal dictionary
| | * | | | | Merge "Fix the title of the fragment of the personal dictionary"Satoshi Kataoka2013-04-302-14/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix the title of the fragment of the personal dictionarySatoshi Kataoka2013-04-302-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is corresponding to I9b8bab21b144385bc2386e7fcb Bug: 8600958 Change-Id: I0a0cf37d0a11c14a51dc63b2e4371facb34514d0
* | | | | | | am 69e1e45c: am 01170ffe: [PB13] Actually update the progress barJean Chalard2013-05-151-5/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '69e1e45c012f5f1c1fa1ec8d096c806c99459ffe': [PB13] Actually update the progress bar
| * | | | | | am 01170ffe: [PB13] Actually update the progress barJean Chalard2013-04-301-5/+60
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01170ffebeb4a604667abb84310ed4e910f97bf7': [PB13] Actually update the progress bar
| | * | | | | [PB13] Actually update the progress barJean Chalard2013-04-301-5/+60
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 7600384 Change-Id: Iaa8f3a59243a15d2a01aaf6017ed85c52b6482a6
* | | | | | am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xmlTadashi G. Takaoka2013-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bcc75456fc01327e8358468131e8daf6095da98': Fix missing string reference of spellchecker.xml
| * | | | | am 965329c1: Fix missing string reference of spellchecker.xmlTadashi G. Takaoka2013-04-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '965329c192ee385c83ccf9b054063f9a68cca34b': Fix missing string reference of spellchecker.xml
| | * | | | Fix missing string reference of spellchecker.xmlTadashi G. Takaoka2013-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a followup of I8dea5393ad. Change-Id: I311c50cf8205298f20694e068bb9a4b661df8a8b
* | | | | | am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update ↵Jean Chalard2013-05-152-3/+93
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lifecycle" * commit '27c91662723f3b4252cff0ecef632156a2162316': [PB12] Implement the progress bar update lifecycle
| * | | | | am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"Jean Chalard2013-04-292-3/+93
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5f2efe0f911f4f547765d260f76412717d232599': [PB12] Implement the progress bar update lifecycle
| | * | | | [PB12] Implement the progress bar update lifecycleJean Chalard2013-04-302-3/+93
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the thread does not run uselessly (it is even terminated when the progress bar exits the screen). Bug: 7600384 Change-Id: I09117a6f763b574b9b3266f36ba3da4720dc9224
* | | | | am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."Jeff Sharkey2013-05-151-2/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '238748d57c8ba770be4c3e34fa6d704893de3d07': Avoid leaking AssetFileDescriptor.
| * | | | am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."Jeff Sharkey2013-04-291-2/+10
| |\| | | | | |/ / | |/| | | | | | | | | | * commit '7a800e7982ff607aa339f44742de935033f38cfe': Avoid leaking AssetFileDescriptor.
| | * | Merge "Avoid leaking AssetFileDescriptor."Jeff Sharkey2013-04-301-2/+10
| | |\ \
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-31 10:31:02 +0000