aboutsummaryrefslogtreecommitdiffstats
path: root/java/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '3ac40c6a' into jb-mr2-dev-plus-aospBaligh Uddin2013-05-152-15/+12
|\ | | | | | | | | | | | | Conflicts: java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java Conflict resolved by matching code with jb-mr2-dev.
| * Merge "Fix Google spell checker tests"Satoshi Kataoka2013-05-012-19/+12
| |\
| | * Fix Google spell checker testsSatoshi Kataoka2013-05-012-19/+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
| * | Introduce MoreSuggestionsListener classTadashi G. Takaoka2013-05-013-22/+49
| | | | | | | | | | | | | | | Bug: 8694255 Change-Id: I9420a7cb1983c6211f58d13b3b11db4347c3f99b
* | | 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
| * | 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-151-0/+4
|\| | | | | | | | | | | | | welcome video * commit '3b8921646fb51b9bb91108cfc103a5feccbbbbe9': Display still image when device can't play welcome video
| * Display still image when device can't play welcome videoTadashi G. Takaoka2013-05-011-0/+4
| | | | | | | | | | | | | | | | Note that the still image in this change is a placeholder and must be replaced by final asset. Bug: 8159728 Change-Id: I4f5a28e0af711edacbc87c2ee64508f34f67f0da
| * 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.
* | | am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"Ken Wakasa2013-05-152-21/+10
|\| | | | | | | | | | | | | | * commit '761b5586a74f86b269335884fef4ab23eadc69f1': 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-151-0/+11
|\| | | | | | | | | | | | | | | | | | | * commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9': Catch error while playing welcome video
| * | | Merge "Catch error while playing welcome video"Tadashi G. Takaoka2013-04-301-0/+11
| |\ \ \
| | * | | Catch error while playing welcome videoTadashi G. Takaoka2013-04-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: Ic8eea7993f12395d6eca6db8d5529803251a9fee
* | | | | am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"Jean Chalard2013-05-151-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'd618419d16865f9cc54ec893873bab514b321815': [PB14] Cosmetic fixes to the progress bar
| * | | | Merge "[PB14] Cosmetic fixes to the progress bar"Jean Chalard2013-04-301-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [PB14] Cosmetic fixes to the progress barJean Chalard2013-04-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7600384 Change-Id: I33ea155c0c97c7ead07686c4d2a9e0d98be9929c
* | | | | am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the ↵Satoshi Kataoka2013-05-151-5/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | personal dictionary" * commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685': Fix the title of the fragment of the personal dictionary
| * | | | Merge "Fix the title of the fragment of the personal dictionary"Satoshi Kataoka2013-04-301-5/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix the title of the fragment of the personal dictionarySatoshi Kataoka2013-04-301-5/+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
| * | | | [PB13] Actually update the progress barJean Chalard2013-04-301-5/+60
| | |/ / | |/| | | | | | | | | | | | | | Bug: 7600384 Change-Id: Iaa8f3a59243a15d2a01aaf6017ed85c52b6482a6
* | | | 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
| * | | [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.
| * | Avoid leaking AssetFileDescriptor.Jeff Sharkey2013-04-291-2/+10
| | | | | | | | | | | | Change-Id: Iac388c8aefc684980cb4c7131fb47319f6073eb3
* | | am 88f3e4ef: am fc26033c: [PB11] Add a skeleton class for a self-updating ↵Jean Chalard2013-05-151-0/+31
|\| | | | | | | | | | | | | | | | | | | | progress bar * commit '88f3e4efd49a0d39b01e37310ebaba2c4b40a040': [PB11] Add a skeleton class for a self-updating progress bar
| * | [PB11] Add a skeleton class for a self-updating progress barJean Chalard2013-04-261-0/+31
| | | | | | | | | | | | | | | Bug: 7600384 Change-Id: I55b51152dd9968a359af091bf309f0d406f63ec4
* | | am eb34f710: am ab0c66b9: [PB10] Add a progress bar to display file download ↵Jean Chalard2013-05-152-2/+18
|\| | | | | | | | | | | | | | | | | | | | progress * commit 'eb34f71088215b7c6514b5f4150057c33f2069d3': [PB10] Add a progress bar to display file download progress
| * | [PB10] Add a progress bar to display file download progressJean Chalard2013-04-262-2/+18
| | | | | | | | | | | | | | | | | | | | | The progress bar is showing but doesn't show progress yet. Bug: 7600384 Change-Id: I80debd3f4368e82e4184a6c638bdcc8e48ed2305
* | | am 4e61cf71: am 739406bf: Merge "[PB9] Make buttons that animate-out ↵Jean Chalard2013-05-152-1/+5
|\| | | | | | | | | | | | | | | | | | | | unclickable" * commit '4e61cf7162c565e71e3aeb1a23d1b4f716392fa4': [PB9] Make buttons that animate-out unclickable
| * | Merge "[PB9] Make buttons that animate-out unclickable"Jean Chalard2013-04-262-1/+5
| |\ \
| | * | [PB9] Make buttons that animate-out unclickableJean Chalard2013-04-262-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking on a button that is animating-out is only done by mistake. Better make them unclickable. Also, interrupt an out-in animation if it has been preempted. Bug: 7600384 Change-Id: Ic4700cda46a894ea580bc67ee7bef885ecf1d3bc
* | | | am faa0c350: am be06bce1: Merge "Get rid of janky black box before the movie ↵Tadashi G. Takaoka2013-05-151-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | starts" * commit 'faa0c3506f012f3a73893f7f0c337bbef9ee4c42': Get rid of janky black box before the movie starts
| * | | Merge "Get rid of janky black box before the movie starts"Tadashi G. Takaoka2013-04-261-0/+8
| |\ \ \
| | * | | Get rid of janky black box before the movie startsTadashi G. Takaoka2013-04-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8159728 Change-Id: I1d0a01a05b3b694d21fdfdc246d1329ab829908d
* | | | | am bb8f6fc4: am d4777552: Merge "Fix graying animation of alt-code keys when ↵Tadashi G. Takaoka2013-05-151-12/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | space/enter is typed" * commit 'bb8f6fc4c755ed1a3a1b433fac34c4f9fdd694dc': Fix graying animation of alt-code keys when space/enter is typed
| * | | | Merge "Fix graying animation of alt-code keys when space/enter is typed"Tadashi G. Takaoka2013-04-261-12/+14
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix graying animation of alt-code keys when space/enter is typedTadashi G. Takaoka2013-04-261-12/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac508f37afa916ca52c62c2369cb7ff91bde0a64
* | | | | am 55d80e4f: am e8ed5d88: Delete obsolete dictionariesJean Chalard2013-05-151-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e': Delete obsolete dictionaries
| * | | | Delete obsolete dictionariesJean Chalard2013-04-261-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7980985 Change-Id: I4c9165e6102cb12fa1249074297e94013439ea3b
* | | | | am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."Jean Chalard2013-05-153-3/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '330072b0146ffe148417d43ee0842c1238b6923d': [ZF2] Read settings for profanity filtering.
| * | | | Merge "[ZF2] Read settings for profanity filtering."Jean Chalard2013-04-263-3/+20
| |\ \ \ \
| | * | | | [ZF2] Read settings for profanity filtering.Jean Chalard2013-04-253-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7226877 Change-Id: Ie0c713e1eba1529c0b288a1e5011023a79bedd6b
* | | | | | am 75a6a525: am adbafa1a: Merge "Support ICS on the user dictionary settings"Satoshi Kataoka2013-05-156-37/+118
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75a6a525e9a34befd931fe666ee761625e6ead99': Support ICS on the user dictionary settings
| * | | | | Merge "Support ICS on the user dictionary settings"Satoshi Kataoka2013-04-266-37/+118
| |\ \ \ \ \
| | * | | | | Support ICS on the user dictionary settingsSatoshi Kataoka2013-04-266-37/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8600958 Change-Id: I50e9228afc7b04147eb7c4734d3145abe8859a30
* | | | | | | am 01f044b0: am dca46b50: Merge "Keep task stack when invoking settings from ↵Tadashi G. Takaoka2013-05-151-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup wizard" * commit '01f044b07a7c90d2b87f5cc31b363326134dfc7c': Keep task stack when invoking settings from setup wizard