7fdd34317d
am 873f9b90: am 6435c800: Merge "Fix an issue on the transition between the setup and the settings"
...
* commit '873f9b90f78857b13328a4a518d1aa8fa4b4f4eb':
Fix an issue on the transition between the setup and the settings
2013-05-15 12:46:53 -07:00
7e5e4c857f
am fe856be8: am f59c4f68: Fix labels in the personal dictionary settings
...
* commit 'fe856be87573cd2641c6cf71e9b5a03e8b5e2491':
Fix labels in the personal dictionary settings
2013-05-15 12:46:51 -07:00
a5f0a52d7c
am 778eabfe: am 244a24e3: Consolidate dummy proximity info to the spell checker info
...
* commit '778eabfe7476b64aaef614c6649d6798b2bbc3bf':
Consolidate dummy proximity info to the spell checker info
2013-05-15 12:46:50 -07:00
8facddba7d
am 9b5965d4: am 1eb1af75: Merge "Fix looping logic bugs."
...
* commit '9b5965d452d55fd271dc14f2328b44da08c3cb67':
Fix looping logic bugs.
2013-05-15 12:46:48 -07:00
3c3828884a
am d2dbbc41: am 104bb70c: Merge "Avoid drawing too long gesture preview trails"
...
* commit 'd2dbbc417484d3f5ef0f4617e037473c75926d4e':
Avoid drawing too long gesture preview trails
2013-05-15 12:46:45 -07:00
d942e6e675
am 0633a208: am 2afe88b8: Merge "Unify space-adding on gestures."
...
* commit '0633a208bcb66afdb32de5b36329c4d559008881':
Unify space-adding on gestures.
2013-05-15 12:46:44 -07:00
4334809ff6
am 1e7c0677: am a9dd74cf: refactor spell checker
...
* commit '1e7c067770b6406c762974406013db24561c2416':
refactor spell checker
2013-05-15 12:46:41 -07:00
55b98d2549
am 7b6b30df: am 9d71a6c9: Remove unused device form factor values
...
* commit '7b6b30dffcf027f50198f9588eaa4918b4e1cda2':
Remove unused device form factor values
2013-05-15 12:46:39 -07:00
710a12e36c
am d192dd94: am 84ac8f31: Move empty listner to KeyboardActionListener.Adapter
...
* commit 'd192dd94ebfb08a6e432c0083ba74a5ea86dd7b1':
Move empty listner to KeyboardActionListener.Adapter
2013-05-15 12:46:38 -07:00
066a445fc4
am 0500edcc: am 40eb31be: Merge "Clean up unused static variable"
...
* commit '0500edccc2b0620ee4e531508052ae6d2a84cc9b':
Clean up unused static variable
2013-05-15 12:46:36 -07:00
bbc91a0671
am c8dcf48e: am ce67b416: Record down point as gesture preview trail for sure
...
* commit 'c8dcf48e022f7964015807dd7d52905ce41bdbfb':
Record down point as gesture preview trail for sure
2013-05-15 12:46:34 -07:00
7afc241d03
am 7a926b3c: am 4ddf1e47: Remove unused gesture preview trail code
...
* commit '7a926b3ca7997920a8dc56c52935676ef787d5e5':
Remove unused gesture preview trail code
2013-05-15 12:46:33 -07:00
4e8fde004f
am a36266dd: am a5be033d: Preserve setup wizard step while orientation change
...
* commit 'a36266dd5840d645e46b18e41ebcdbea4a21c0e4':
Preserve setup wizard step while orientation change
2013-05-15 12:35:28 -07:00
3c93fdc8e0
am 9bb189f6: am 7d19ab5c: Using int instead of booleans to save keyboard shift state
...
* commit '9bb189f6131eda218bd76a055a3f4c83fbd0d088':
Using int instead of booleans to save keyboard shift state
2013-05-15 12:35:27 -07:00
62dd1ee3aa
am 3c1a18c6: am 7f8dd50b: Save automatic shift state while orientation changing
...
* commit '3c1a18c6a6540300aea96b3195920f5a1e159e09':
Save automatic shift state while orientation changing
2013-05-15 12:35:25 -07:00
a8fb8b4bb4
am e351e10a: Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit 'e351e10a68ad6e934ee3cfdd6456f9474d76facb':
Import translations. DO NOT MERGE
2013-05-15 12:29:35 -07:00
e229cd9743
am d8e55277: am 83757d43: Merge "Pass blockOffensiveWords as a parameter"
...
* commit 'd8e5527701ffe1d9da2280bf7bcca7834387b1c6':
Pass blockOffensiveWords as a parameter
2013-05-15 12:24:00 -07:00
6b93b185ef
am 3eee5cd2: am 53b37dc0: Merge "Fix a layout problem for pre-MR2"
...
* commit '3eee5cd24b259109b9b2122026a494a050a540e9':
Fix a layout problem for pre-MR2
2013-05-15 12:23:55 -07:00
c363302eb7
Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp
...
Conflicts:
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
Conflict resolved by matching code with jb-mr2-dev.
2013-05-15 11:40:41 -07:00
1e08d3d259
am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
...
* commit '6191026ce4e4cc756f47135223f58318d35d3143':
Introduce MoreSuggestionsListener class
2013-05-15 11:26:02 -07:00
d53fb22a97
am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
...
* commit 'fcfa2cb24fe4151e28574d3da4397bcc04f3d50a':
Add permissions for personalization
2013-05-15 11:26:00 -07:00
2f6851d9da
am f405dc87: am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed"
...
* commit 'f405dc87a8e61fe95c8e4ee5b81a2f4cd005dfd0':
Override View.drawableStateChanged to detect state_pressed
2013-05-15 11:25:59 -07:00
03fe0cf4dd
am 3b892164: am 7b2114a4: Display still image when device can\'t play welcome video
...
* commit '3b8921646fb51b9bb91108cfc103a5feccbbbbe9':
Display still image when device can't play welcome video
2013-05-15 11:25:56 -07:00
45fe5c3429
am 761b5586: am a0b62ece: Merge "Cleanup an unused return value"
...
* commit '761b5586a74f86b269335884fef4ab23eadc69f1':
Cleanup an unused return value
2013-05-15 11:19:48 -07:00
24fc5ab65f
am f4a03ddc: am 1187ef9a: Merge "Catch error while playing welcome video"
...
* commit 'f4a03ddcf85a546a7ed9eb59840fd81e4c014de9':
Catch error while playing welcome video
2013-05-15 11:19:36 -07:00
9db1f6d9c6
am d618419d: am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar"
...
* commit 'd618419d16865f9cc54ec893873bab514b321815':
[PB14] Cosmetic fixes to the progress bar
2013-05-15 11:19:35 -07:00
fa47814ca3
am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary"
...
* commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685':
Fix the title of the fragment of the personal dictionary
2013-05-15 11:19:28 -07:00
bc81ac838a
am 69e1e45c: am 01170ffe: [PB13] Actually update the progress bar
...
* commit '69e1e45c012f5f1c1fa1ec8d096c806c99459ffe':
[PB13] Actually update the progress bar
2013-05-15 11:19:12 -07:00
58434ae636
am 3bcc7545: am 965329c1: Fix missing string reference of spellchecker.xml
...
* commit '3bcc75456fc01327e8358468131e8daf6095da98':
Fix missing string reference of spellchecker.xml
2013-05-15 11:19:00 -07:00
861d7cea30
am 27c91662: am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle"
...
* commit '27c91662723f3b4252cff0ecef632156a2162316':
[PB12] Implement the progress bar update lifecycle
2013-05-15 11:18:43 -07:00
f892099b3e
am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
...
* commit '238748d57c8ba770be4c3e34fa6d704893de3d07':
Avoid leaking AssetFileDescriptor.
2013-05-15 11:17:59 -07:00
4779ea605a
am 88f3e4ef: am fc26033c: [PB11] Add a skeleton class for a self-updating progress bar
...
* commit '88f3e4efd49a0d39b01e37310ebaba2c4b40a040':
[PB11] Add a skeleton class for a self-updating progress bar
2013-05-15 11:05:23 -07:00
e486427650
am eb34f710: am ab0c66b9: [PB10] Add a progress bar to display file download progress
...
* commit 'eb34f71088215b7c6514b5f4150057c33f2069d3':
[PB10] Add a progress bar to display file download progress
2013-05-15 11:05:22 -07:00
33ccdd1cda
am b312f4a8: am ae577ac1: Merge "Update dictionaries"
...
* commit 'b312f4a8f78f423c5507785f5fbf79d6c786e5bc':
Update dictionaries
2013-05-15 11:05:20 -07:00
605e28c189
am 4e61cf71: am 739406bf: Merge "[PB9] Make buttons that animate-out unclickable"
...
* commit '4e61cf7162c565e71e3aeb1a23d1b4f716392fa4':
[PB9] Make buttons that animate-out unclickable
2013-05-15 11:05:17 -07:00
95abe990e3
am faa0c350: am be06bce1: Merge "Get rid of janky black box before the movie starts"
...
* commit 'faa0c3506f012f3a73893f7f0c337bbef9ee4c42':
Get rid of janky black box before the movie starts
2013-05-15 11:05:15 -07:00
3983196461
am bb8f6fc4: am d4777552: Merge "Fix graying animation of alt-code keys when space/enter is typed"
...
* commit 'bb8f6fc4c755ed1a3a1b433fac34c4f9fdd694dc':
Fix graying animation of alt-code keys when space/enter is typed
2013-05-15 11:05:14 -07:00
e7c5c8f6fd
am 55d80e4f: am e8ed5d88: Delete obsolete dictionaries
...
* commit '55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e':
Delete obsolete dictionaries
2013-05-15 11:05:07 -07:00
926abffaaa
am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words"
...
* commit '42abed7ff30b4ad4c04407a81db8de86244b1d80':
[ZF3] Add the option to block potentially offensive words
2013-05-15 11:05:06 -07:00
3160671bc1
am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering."
...
* commit '330072b0146ffe148417d43ee0842c1238b6923d':
[ZF2] Read settings for profanity filtering.
2013-05-15 11:05:03 -07:00
4746093c3c
am a9b0c4fb: am 1ff8b1ce: Merge "Update dictionaries"
...
* commit 'a9b0c4fb9d0247ccdc92984de2d972136a8d34bb':
Update dictionaries
2013-05-15 11:05:01 -07:00
685b65580b
am 75a6a525: am adbafa1a: Merge "Support ICS on the user dictionary settings"
...
* commit '75a6a525e9a34befd931fe666ee761625e6ead99':
Support ICS on the user dictionary settings
2013-05-15 11:04:59 -07:00
e681b52822
am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project"
...
* commit '7a2fbbb3e6c807340be95807fbd70042466a5426':
Add strings-appname.xml to AOSP Android Keyboard project
2013-05-15 11:04:58 -07:00
33eaf07315
am 01f044b0: am dca46b50: Merge "Keep task stack when invoking settings from setup wizard"
...
* commit '01f044b07a7c90d2b87f5cc31b363326134dfc7c':
Keep task stack when invoking settings from setup wizard
2013-05-15 11:04:56 -07:00
037be7fa0a
am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing"
...
* commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32':
Remove graying animation of alt-code keys while typing
2013-05-15 11:04:55 -07:00
511432b23c
am ba4677fe: am df3ca042: Fix deleting a dictionary
...
* commit 'ba4677fe0b47aa17ac2a5856d9e71c83eaa71c40':
Fix deleting a dictionary
2013-05-15 11:04:52 -07:00
5ca33bdc5b
am 12b35158: am 1919072c: Merge "[ZF1] Check profanity in Java rather than in native"
...
* commit '12b35158efe759c772454059b69615b6c6b6b854':
[ZF1] Check profanity in Java rather than in native
2013-05-15 11:04:51 -07:00
fa51a86b31
am 9799b7dc: am fb34869f: Merge "[PB8] Add an animation upon status change."
...
* commit '9799b7dc712f3b0d5c320856b172970a9221a18d':
[PB8] Add an animation upon status change.
2013-05-15 11:04:49 -07:00
03b6259b75
am 4ecc0a29: am b1b03cfc: Merge "Fix missing initialization of PreviewPlacerView"
...
* commit '4ecc0a2972bb7747b797c498cc79e4135220bae0':
Fix missing initialization of PreviewPlacerView
2013-05-15 11:04:48 -07:00
e6b7fa9310
am 47c5846d: am 43590149: Work around a bug in older DownloadManager versions.
...
* commit '47c5846dae1452e5e0e480cef91838ebe1d01a48':
Work around a bug in older DownloadManager versions.
2013-05-15 11:04:45 -07:00
b7853edee0
am 13a2e1b2: am 4dc77dcf: Merge "[PB7] Export animation code out of the preference"
...
* commit '13a2e1b245c56812fd91099b4fe91a6111a14c0f':
[PB7] Export animation code out of the preference
2013-05-15 11:04:44 -07:00
8810ac41af
am c090b38c: am a995bf40: Put temp files within app files
...
* commit 'c090b38c15cadf9655b2ba026639a42b76c2ea1f':
Put temp files within app files
2013-05-15 11:04:42 -07:00
56ec8d6a02
am 36de7a5e: am 30f0f3a9: Merge "Implement a functionality to add an entry to the user dictionary"
...
* commit '36de7a5ea32ef6738a2923581e0b14a00b8a6808':
Implement a functionality to add an entry to the user dictionary
2013-05-15 11:04:41 -07:00
2037d6e41d
am 7e22f2e3: am 2cf450f4: [PB6] Encapsulate the buttons into a view
...
* commit '7e22f2e374425f5676fb9eac4bfb97e211d0d487':
[PB6] Encapsulate the buttons into a view
2013-05-15 11:04:40 -07:00
6ace521500
am 7a9ec9dd: am e91387e2: Merge "[PB5] Store state in a more convenient manner"
...
* commit '7a9ec9dd5368c66bc4db8b52d217560339d7929f':
[PB5] Store state in a more convenient manner
2013-05-15 11:04:38 -07:00
a4d5187a4c
am 6157a049: am e91c001d: Merge "[PB4] Make a memory non-static"
...
* commit '6157a049268dc1c1e9640a2f49791c54b8bd944b':
[PB4] Make a memory non-static
2013-05-15 10:59:06 -07:00
454962153d
am 77bcc98a: am 80790d78: Merge "[PB3] Simplify storage"
...
* commit '77bcc98ab2f1d3c9b62ee62c1eb4e3fa87f47967':
[PB3] Simplify storage
2013-05-15 10:59:05 -07:00
49ab021b38
am e52eb1f7: am 776edcfe: Merge "[PB2] Small bugfix"
...
* commit 'e52eb1f706c5f9e6424081395f089f0e30a2ee44':
[PB2] Small bugfix
2013-05-15 10:59:01 -07:00
b713600a52
am fd4baafe: am 46913aed: Merge "Add next axction to setup wizard"
...
* commit 'fd4baafe710dc0fe843c7672a6bd8bee4244fd73':
Add next axction to setup wizard
2013-05-15 10:58:58 -07:00
dfa5d2d799
am 38df0ed2: am b40a8c06: Merge "Tune setup wizard layout for landscape and tablet"
...
* commit '38df0ed22b232d77119c709ee0e7a863c7f756b6':
Tune setup wizard layout for landscape and tablet
2013-05-15 10:58:57 -07:00
96d5e29166
am 6448f749: am b35aa487: Merge "Make aggressive threshold really aggressive"
...
* commit '6448f749154a723b85d4309a37ad8fda2e1434e3':
Make aggressive threshold really aggressive
2013-05-15 10:58:55 -07:00
7710c9d59f
am ceb3f293: am 0e96003e: Merge "Refactor SetupStepGroup"
...
* commit 'ceb3f293f010ae75ed5d3d3715a2807537e8b614':
Refactor SetupStepGroup
2013-05-15 10:58:53 -07:00
b689e6615b
am 9ff6a6bf: am 3ee39be1: Merge "Add setup wizard indicator size resource"
...
* commit '9ff6a6bf739e250f2ad7e868c2be55567c23fb7b':
Add setup wizard indicator size resource
2013-05-15 10:58:50 -07:00
1f4b748196
am 6a355d2d: am 197a2d32: Merge "[PB1] Cleanup"
...
* commit '6a355d2d189388833148cf3850429b38d57ae9e9':
[PB1] Cleanup
2013-05-15 10:58:49 -07:00
230068e2cd
am 5cd83c93: am 9a289c08: Merge "Use resources for dimensions of setup wizard"
...
* commit '5cd83c9341c04c63de136b0e1e8b581e88704075':
Use resources for dimensions of setup wizard
2013-05-15 10:58:45 -07:00
d66e4c4515
am 0bc46dca: am 4b7e0c5a: Merge "Remove wording "wizard" from setup application"
...
* commit '0bc46dca2cea2b15e1647533f81ea0ea992a41b4':
Remove wording "wizard" from setup application
2013-05-15 10:58:41 -07:00
85e8dca43e
am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu"
...
* commit 'dc079451fc5bb10548d0d78c8db5e060e9a2f000':
Add edit personal dictionary settings menu
2013-05-15 10:58:40 -07:00
5fe03e939f
am 1aab945b: am c3f47836: Add an additional ID to the client info.
...
* commit '1aab945b2ac1a1232f1cdcb843251f93ad1c3232':
Add an additional ID to the client info.
2013-05-15 10:58:39 -07:00
874c4fda36
am 434abe45: am 9b4e3db1: Legal notice
...
* commit '434abe450c8fd65789b6f8b04d62ad98287115dd':
Legal notice
2013-05-15 10:53:02 -07:00
16bacd59d5
am 34b00870: am 1a9bf159: Merge "Don\'t triger onPress and startLongPressTimer when gesture is canceled"
...
* commit '34b0087038eadf8efe1ce851ad3ba41c354152d1':
Don't triger onPress and startLongPressTimer when gesture is canceled
2013-05-15 10:53:00 -07:00
7a58488065
am 80a98ee5: am 508ab248: Merge "Implement IMM.switchToNextInputMethod() for ICS"
...
* commit '80a98ee5c23024f3da7794f692a0ef69debe99d6':
Implement IMM.switchToNextInputMethod() for ICS
2013-05-15 10:52:59 -07:00
962c245c00
am 6bbe6858: am 0f07935e: Centering setup wizard welcome video
...
* commit '6bbe68589318a808c0eade6a62ffb0986a894ae0':
Centering setup wizard welcome video
2013-05-15 10:52:54 -07:00
6f3b9ddd76
am bd99e8dc: am 41b34cf2: Merge "Allow LogUnits to hold >1 word"
...
* commit 'bd99e8dc246faeafa5849078dce47fb379d23eb1':
Allow LogUnits to hold >1 word
2013-05-15 10:52:51 -07:00
643bdb0ff4
am 6f6974e6: am 825da76c: Redisplay a hidden button after it entered the screen again.
...
* commit '6f6974e6e9a2b177cf1355395e52652b49a13c3a':
Redisplay a hidden button after it entered the screen again.
2013-05-15 10:52:49 -07:00
12e180a6c3
am 6dc9933d: am f8014eea: Hide the correct button when pressing a new button.
...
* commit '6dc9933d83c166b57dcfc42d5738423cde2e5bee':
Hide the correct button when pressing a new button.
2013-05-15 10:52:48 -07:00
56c6c336b2
am ab11dbe8: am b8ff89c8: Remove translatable="false" from setup wizard strings
...
* commit 'ab11dbe8f3fbc7b55b251d69e3846cab24811903':
Remove translatable="false" from setup wizard strings
2013-05-15 10:52:46 -07:00
67f3a10225
am c35e0e6a: am 42afa82d: Support landscape orientation for setup wizard
...
* commit 'c35e0e6a4b73f854fef07165c4f0bdd448f5bed5':
Support landscape orientation for setup wizard
2013-05-15 10:52:44 -07:00
e84697326f
am b3663df5: am 68e4de1e: Add welcome screen to setup wizard
...
* commit 'b3663df58238cc8e95e9b412964f6e8f43465d70':
Add welcome screen to setup wizard
2013-05-15 10:52:43 -07:00
b2f8f66f28
am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen
...
* commit 'baa1e14da10fd1ab31780f08ffeb4f186124fc41':
Groundwork to implement landscape and welcome screen
2013-05-15 10:52:41 -07:00
680fa7ba77
am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard"
...
* commit '82a7b185bb8a14e610950548d36fae7a06030236':
Add finish action to setup wizard
2013-05-15 10:52:40 -07:00
8f9a8734d5
am fc2ca29d: am f10046bd: Remove ScrollView from setup wizard
...
* commit 'fc2ca29d71ef85a93170a7c5f2d61c084a694bb2':
Remove ScrollView from setup wizard
2013-05-15 10:52:35 -07:00
448b28beff
am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files
...
* commit 'ed0d1156f7c95666b22e10284d8f985a5e83f283':
Move some attributes of setup wizard layouts to style files
2013-05-15 10:52:33 -07:00
64510ad979
am ae19f170: am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated"
...
* commit 'ae19f170ba511d0bcb7632682b8f9ac45a91ece7':
Make setup wizard step number highlighted when activated
2013-05-15 10:52:32 -07:00
8b085e7f87
am 7158438a: am 88ee052c: Merge "Update strings of setup wizard"
...
* commit '7158438a64d3f224590c484c989251d82b7fb5fa':
Update strings of setup wizard
2013-05-15 10:52:30 -07:00
52e0b3d1b8
am 0e64fbbc: am 9cf46864: Update dictionaries
...
* commit '0e64fbbcac7116c410143796937e4e5ef1238c83':
Update dictionaries
2013-05-15 10:46:54 -07:00
a06fdaadae
am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"
...
* commit '64e87b3e660199b5dd7539fe413146e4dfbf977f':
Update setup wizard icons
2013-05-15 10:46:52 -07:00
1efcbd67cd
am 8acab80a: am 56f35a10: Merge "Fix bug in counting words between samples"
...
* commit '8acab80a8680956038b45912d3e00a1d6a5e3cdb':
Fix bug in counting words between samples
2013-05-15 10:46:51 -07:00
af0d283bc4
am 4e12347e: am 931e2530: (-s ours) am 37ac3b3a: am a559e767: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
...
* commit '4e12347e0313279d13a267bd827c025949447743':
2013-05-15 10:42:18 -07:00
b1767bc433
am 40070707: am 7a172175: Merge "Fix user recording dialog"
...
* commit '40070707d83fb2a105292a0683fa22a1094e58fe':
Fix user recording dialog
2013-05-15 10:36:46 -07:00
5abe65f1da
am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"
...
* commit '72ca59bc2a29eaadf0b557995a137c8f682d82bb':
Fix alarm bug
2013-05-15 10:36:44 -07:00
453b371d2f
am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"
...
* commit '1019c630fafd4bffd3fb51a0b83dfc532dcd5306':
Avoid duplicate MotionEvents
2013-05-15 10:36:42 -07:00
10270196c8
am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"
...
* commit 'a2a2905033d37784b84191eec8d1efa3cd5b4819':
Label logUnits after LatinImeOnEndBatchInput
2013-05-15 10:36:39 -07:00
86b2c57c47
am f5864fbb: am a5bfac5b: Merge "Fix NPE"
...
* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12':
Fix NPE
2013-05-15 10:36:37 -07:00
79cd791b72
am f9c137aa: am 7da87f97: Merge "Clean up unnecessary log messages"
...
* commit 'f9c137aa600aa804110437a9385de8b5338a28b8':
Clean up unnecessary log messages
2013-05-15 10:36:30 -07:00
22c706aa36
am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"
...
* commit 'a9c2ff1b236624e7aefeecb2dbd2829e8217130c':
Fix logic error
2013-05-15 10:36:26 -07:00
4a885f254d
am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"
...
* commit 'b20c7ee75093ae9c111daf64d9e4f8509d692824':
Fix JsonWriter bug
2013-05-15 10:36:24 -07:00
80a6848d8a
am 6c80e047: am dac3ee49: Merge "Small dot in corner was not visible"
...
* commit '6c80e0475c8cde60fbadb9bab892a74dfa60132a':
Small dot in corner was not visible
2013-05-15 10:36:22 -07:00
21a2cfca20
am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"
...
* commit 'abc8d564eb0674887b5b1ebae3c1029935f4bb7b':
Include nanoTime in filename
2013-05-15 10:36:20 -07:00
0474d725b4
am e85e3c64: am 46420204: Add user feedback to setup action labels and icons
...
* commit 'e85e3c64767552461debc0b1989f09033f7e3054':
Add user feedback to setup action labels and icons
2013-05-15 10:36:18 -07:00
76cc6abc3a
am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as translatable"
...
* commit '0206339a2664d1cb05fff3ff20352cf04871bef1':
Finalize setup wizard strings and mark as translatable
2013-05-15 10:36:16 -07:00
1626830701
am bb84fdd1: am bb5deb82: Fix singleton/utility classes initialization in SettingsFragment
...
* commit 'bb84fdd134e0a5aff268d5d475091e023778655d':
Fix singleton/utility classes initialization in SettingsFragment
2013-05-15 10:36:14 -07:00
6dd2130d84
am 2101ba41: am 888a194c: Fix missing AudioAndHapticFeedbackManager initialization
...
* commit '2101ba410c4fd12919b3b84e4e6bcc61b1897e70':
Fix missing AudioAndHapticFeedbackManager initialization
2013-05-15 10:36:12 -07:00
b1e37e4a47
am f1dcf725: Merge "Don\'t process recorrection or resets when not shown"
...
* commit 'f1dcf725061b3e61e40540566a5385cf4934f424':
Don't process recorrection or resets when not shown
2013-05-15 07:58:27 -07:00
25f0c8089e
am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
...
* commit '96a9f357c7e2a059687926cd7cd52ac5d06bc65e':
Fix unintentional setup step advance in orientation change
2013-05-15 07:58:18 -07:00
d59c1f8324
am 50259c70: Merge "Tune layout parameters of setup wizard"
...
* commit '50259c70d7754569a7b552cfc6ef8a034b5b0d40':
Tune layout parameters of setup wizard
2013-05-15 07:58:05 -07:00
7d9bd6f54e
am 66b87269: Update welcome fallback image (using xhdpi asset)
...
* commit '66b87269e16a0ed4b13a58bca5dd3a41318ad241':
Update welcome fallback image (using xhdpi asset)
2013-05-15 07:57:51 -07:00
7fe675440e
am 769427cf: Adjust aspect ratio of setup image
...
* commit '769427cff24944958f5f1f6179090a86444f3eab':
Adjust aspect ratio of setup image
2013-05-15 07:57:38 -07:00
f1dcf72506
Merge "Don't process recorrection or resets when not shown"
2013-05-15 11:25:25 +00:00
c9aaba1253
Don't process recorrection or resets when not shown
...
Bug: 8954116
Change-Id: Ica27dbfc570643bb81e6cdf34cc7c796ea080d71
2013-05-15 20:20:20 +09:00
96a9f357c7
Merge "Fix unintentional setup step advance in orientation change"
2013-05-15 10:52:21 +00:00
9b4a883e09
Fix unintentional setup step advance in orientation change
...
Bug: 8159728
Change-Id: I53e7d7c8fb5cc231ea94474b091e550f77ae8dab
2013-05-15 19:50:35 +09:00
50259c70d7
Merge "Tune layout parameters of setup wizard"
2013-05-15 10:13:24 +00:00
66b87269e1
Update welcome fallback image (using xhdpi asset)
...
Bug: 8159728
Change-Id: Ifd7339c7db305de424109b6adb126b354028b3aa
2013-05-15 18:36:13 +09:00
86ee98dd55
Revert "Update welcome fallback image"
...
This reverts commit c1ff8d7d3f
2013-05-15 18:32:03 +09:00
786bc9d46f
Tune layout parameters of setup wizard
...
Bug: 8159728
Change-Id: Ifb08b62e11008ad56715a07825c0fbc719130ebd
2013-05-15 17:49:56 +09:00
769427cff2
Adjust aspect ratio of setup image
...
Bug: 8159728
Change-Id: I578014912fa63c4c9b4c2c89aeae7ffec836b06c
2013-05-15 14:48:27 +09:00
c1ff8d7d3f
Update welcome fallback image
...
Bug: 8159728
Change-Id: I0306efe99aa8db97ec6a1888240f0538480ebea5
2013-05-15 10:41:08 +09:00
993acbaaa2
Remove unnecessary commit/uncommit
...
When the user reverts a commit, this causes the committed
word to be changed. The user usually then goes back to edit
that word. Going back to edit causes an uncommit, so that
the editing actions are added onto the LogUnit containing
the operations used to construct the word.
But currently, reverting also involves its own
commit/uncommit pair, with the caller performing the
uncommit, and the commit happening inside the revert
command. This may have been necessary in the past, when
revert was called in different situations, but is
unnecessary now. Furthermore, the guarding conditions are
currently such that the uncommit doesn't always undo the
effects of the commit, corrupting the log output.
Change-Id: I74af41f4f1db2fcabfa496dcc4a2d7bd0af19b3a
2013-05-14 12:20:27 -07:00
7b0a148951
Merge "Rename a var to match semantics"
2013-05-14 16:11:07 +00:00
3e8df13cd7
Add claifying comment
...
This is a follow-up to I7c01c3dd3ac33d7e96c00836256bae9c14b124ed
Change-Id: I9e3f8968c4bbf9525d5dfe101f71373c42f88361
2013-05-14 09:10:22 -07:00
b2d53be740
Merge "Remove FeedbackLog instance variables."
2013-05-14 13:09:33 +00:00
8b56ad7814
Merge "Revise welcome screen video and still image"
2013-05-14 12:01:47 +00:00
7348d9fb72
Revise welcome screen video and still image
...
Bug: 8159728
Change-Id: Ief8d7197879d24ccef529e975c23d6f11c7aa458
2013-05-14 20:56:09 +09:00
d78c776b7b
Merge "Adjust sampling interval for gesture stroke drawing a bit."
2013-05-14 11:55:33 +00:00
5a6827dbff
Adjust sampling interval for gesture stroke drawing a bit.
...
bug: 7167303
Change-Id: I45ca9d31cf4f8492dde367f997d8e36f4a07cffe
2013-05-14 20:53:12 +09:00
d6d70e7325
Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
2013-05-14 11:46:04 +00:00
3efa36f6aa
Revert "Fix isSuggestionsStripVisible when keyboard hidden"
...
This reverts commit cb0d1c4c58
2013-05-14 11:44:22 +00:00
41016acacf
Back to previous keyboard layout by canceling sliding input
...
Bug: 8915171
Change-Id: Iabdeb7920f67f89246087c3ee06240406ecfbc3d
2013-05-14 20:28:03 +09:00
c9398a3b39
Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
2013-05-14 06:53:15 +00:00
979fb7415b
Fix PointerTrackerQueue.releaseAllPointerOlderThan
...
Change-Id: If353869720895ee5355079c15c724132762dd70c
2013-05-14 15:32:21 +09:00
cb0d1c4c58
Fix isSuggestionsStripVisible when keyboard hidden
...
When the keyboard is hidden, the suggestion strip is
never visible.
Bug: 8954116
Change-Id: I9f242d07b49ad60b625a22429bb013251e814905
2013-05-14 15:19:19 +09:00
6fefc142cf
Remove FeedbackLog instance variables.
...
For a while, the ResearchLogger supported comprehensive recording of the
last few words in case the user wished to upload this data to give
developers feedback. However, this mechanism was not implemented well
(keeping a separate copy of the data), did not make the collected data
clear to the user, and was not working properly in the latest build (NPEs).
The mechanism in fact was deprecated in favor of the "userRecording"
mechanism in which the user explicitly turned on comprehensive recording,
demonstrated the issue they were experiencing, and then turned it off.
This change removes the vestiges of the FeedbackLogging mechanism.
A feedback log is still used to hold the user's message, but it is created
in a local variable as-needed, and not persisted in ResearchLogger.
Change-Id: I6a09d0ed36e1eddb6e57895e7428d22107f75f49
2013-05-13 20:37:15 -07:00
b5c39f4531
Rename a var to match semantics
...
The IS_INHIBITING_AUTO_UPLOAD flag is tested in isPossibleToUpload, so it inhibits all uploads, not
just automatic ones. Renaming to IS_INHIBITING_UPLOAD.
Change-Id: Iceed79260d4b062147f40c09f0c5bb06b2519b1b
2013-05-13 17:01:39 -07:00
e69066d11b
Import translations. DO NOT MERGE
...
Change-Id: I9b70a81c1f507e5e9a2bfdcb179dea1cc03e0517
Auto-generated-cl: translation import
2013-05-13 11:35:25 -07:00
b121538e0c
Tune maximum keypress duration to 100 milliseconds
...
Bug: 8556975
Change-Id: If7839c5764f7a269243a9570c0b7782b6f7ee73b
2013-05-13 20:04:59 +09:00
e8336aa80c
Merge "Fix keypress vibration duration of HTC One X"
2013-05-13 10:52:09 +00:00
5f857a359a
Merge "Disable functional key while in sliding input mode"
2013-05-13 10:50:32 +00:00
567a759b7b
Fix keypress vibration duration of HTC One X
...
Bug: 8556975
Change-Id: I793dd90223f4da091a212ff54a02d19f03e49d6c
2013-05-13 19:49:47 +09:00
e3b1bdc4f1
Disable functional key while in sliding input mode
...
This change registers the functional key when sliding input mode is
end at the functional key itself.
Bug: 8915171
Change-Id: I2031e2aa4ebf33684221fc44d4a808112489724f
2013-05-13 19:39:57 +09:00
b5f67e7faf
Add device specific keypress vibration duration database
...
Bug: 8556975
Change-Id: I11260a64dc13c102bac7a9742dc66f2b05fd32de
2013-05-13 18:34:48 +09:00
0efd8d1b69
Fix landscape override value expression
...
This is a follow up of I275c99db8a.
Bug: 8556975
Change-Id: Ia6c2ab878760523da767036ce0bfc6c8350e1a92
2013-05-13 18:19:20 +09:00
6b0bcfba9b
Merge "Disable long press timer while sliding input mode"
2013-05-13 08:57:56 +00:00
43ad100d8b
Disable long press timer while sliding input mode
...
Bug: 8915171
Change-Id: Id8685f90766c7de55b56476de83abf97150a186d
2013-05-13 17:40:26 +09:00
ad662adeef
Disable delete key repeating while in slide input mode
...
Bug: 8915171
Change-Id: I04f84c29f10abc0207072d2165c75dd20f053f92
2013-05-13 17:23:08 +09:00
18184eacb1
Support regular expression for condition pattern
...
Bug: 8556975
Change-Id: Iffc53d6a40dd77860434c5f7f4f59af5cd1ba92b
2013-05-13 16:25:03 +09:00
ec83457d72
Merge "Support multiple condition for getDeviceOverrideValue"
2013-05-13 06:13:20 +00:00
d69fa0a09a
Support multiple condition for getDeviceOverrideValue
...
Bug: 8556975
Change-Id: I29d3a305b6ac3d8e3620c6d8592d85047d62bf48
2013-05-13 14:38:21 +09:00
cb3bba3c4e
Rename GesturePreviewTrail.java -> GestureTrail.java
...
Try reducing some confusions between GesturePreviewTrail.java and GestureTrailsPreview.java
Change-Id: I5fe2ee740cf1b32210530188153f6f6937e34b68
2013-05-13 13:42:22 +09:00
7d72ca0b20
Avoid JsonWriter multi-write error
...
JsonWriter requires that its clients pass it only a single top-level object.
The existing implementation tries to make code cleaner by having mJsonWriter
never be null, and instead use a global static "NULL_JSON_WRITER" that just
discards data. But because JsonWriter complains if more than one top-level
object is passed, making this a global object does not work. This change
instead copes with mJsonWriter being null.
Change-Id: Ia37ccfc8646e91f11a64713dd92d2846eb86ac54
2013-05-10 18:21:08 -07:00
260df84197
Merge "Remove unused code"
2013-05-10 22:12:11 +00:00
bb17034f64
Merge "Remove ref to LatinImeLogger preference."
2013-05-10 20:41:52 +00:00
4135c2db7b
Merge "Avoid NPE by fixing ResearchLogger initialization"
2013-05-10 15:48:04 +00:00
565ced4546
Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
2013-05-10 09:49:07 +00:00
6d3d2ae064
Refactor StringUtils.findPrefixedString to findValueOfKey
...
Bug: 8556975
Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307
2013-05-10 18:44:04 +09:00
4705c0fa7c
Fix screen flash when launching settings activity
...
Bug: 8336068
Change-Id: I90a0f259129a3f3319b158b060154cc43960c234
2013-05-10 15:36:24 +09:00
2b5c9726f4
Introduce another activity to launch setup wizard
...
Bug: 8336068
Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33
2013-05-10 15:30:53 +09:00
5ffa5bf3ba
Merge "Keep SetupActivity alive to check re-launching from launcher"
2013-05-10 06:24:52 +00:00
9ed322b40f
Keep SetupActivity alive to check re-launching from launcher
...
Bug: 8336068
Change-Id: I183b8e3fd1b3898d5f8dbbb13a0c93c64341fc38
2013-05-10 15:15:53 +09:00
2564bd0937
Merge "Reuse old preferences if possible."
2013-05-10 05:56:32 +00:00
a2ec5e8338
Reuse old preferences if possible.
...
This is an optimization. It also happens to work around what
seems to be a framework bug in JB MR1 / MR1.1.
Bug: 8771179
Change-Id: I62cc7acdc8656d75f8a50c068c4e9d8c6ceb74a0
2013-05-10 14:41:36 +09:00
ba35426f01
Merge "Tweak a label in the personal dictionary settings"
2013-05-10 03:27:51 +00:00
2ad7023c54
Fix detecting out of keyboard area
...
Bug: 8885165
Change-Id: I85c78b23955169972fb0f5395463b6fe47f12c9c
2013-05-10 12:16:44 +09:00
4c6a5c0428
Tweak a label in the personal dictionary settings
...
Bug: 8897600
Change-Id: Ibf245e32468e5740ad9d65b8ff1f1e87b430d287
2013-05-10 12:14:22 +09:00
a68cace7d1
Avoid NPE by fixing ResearchLogger initialization
...
Previously, mMainResearchLog and mMainLogBuffer were set up
when the user moved to a new TextView, and set to null when
the user left the TextView. This change causes
mMainResearchLog, mMainLogBuffer, mFeedbackLog, and
mFeedbackLogBuffer to be non-null forever after init() is
called. start() no longer sets up these fields; instead
they are cleared and reset every time stop() is called.
Checks for null values are now removed.
The earlier code just didn't initialize these variables if
the user disabled logging, but since the new version
invariantly keeps these variables valid, we add a check for
whether the user has enabled logging in publishLogUnits().
Change-Id: Ifde3517f1cf924cfa33cda95fec24529b52b3c08
2013-05-09 18:38:32 -07:00
011634163c
Remove unused code
...
Change-Id: I192c67e9e8de44f073abc70ec85ebcdb36356c2e
2013-05-09 14:36:40 -07:00
ef5d760ca4
Remove ref to LatinImeLogger preference.
...
This is a bug; the ResearchLogger uses ResearchSettings.readResearchLoggerEnabledFlag() instead,
which the user cannot change. (We assume they will just switch to a different keyboard.)
Change-Id: Ib5731c9eeb2bc29d9cf8608033326674f5eb6f7b
2013-05-09 14:36:40 -07:00
8dafc8e834
am 22e6a5c5: Import translations. DO NOT MERGE
...
* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415':
Import translations. DO NOT MERGE
2013-05-09 08:52:51 -07:00
42dc0c2562
Merge "Import translations. DO NOT MERGE"
2013-05-09 15:52:00 +00:00
341f1b237b
Tweak gesture debug
...
Change-Id: Iea11a095adb15fbf4be38f34542119f8bc7bcbff
2013-05-09 20:08:50 +09:00
52cb409ac2
Don't resize debug array if production
...
Bug: 8556775
Change-Id: I46a10f8dc938cab493933f0f2b4e1f7779b24f6f
2013-05-09 19:22:24 +09:00
b2c4c73064
Add debug facilities for gesture
...
Bug: 8556775
Change-Id: I9069b2b44356bbae9fa4aaf0b99c3d723a8c9c58
2013-05-09 19:19:11 +09:00
b902109000
Fix usages of getEnabledInputMethodSubtypeList
...
Bug: 8450279
Change-Id: Ib8433442ae6ca6c28da2652bff687cdeaf7c196e
2013-05-09 17:07:19 +09:00
499cea949d
Use revised Google Keyboard icon
...
Bug: 8159728
Change-Id: I458df60cb39f81cde3c08190af0ab08d304f9d98
2013-05-09 11:50:39 +09:00
3e37586316
Launch setup wizard as single top activity
...
Bug: 8336068
Change-Id: Ifac84361e4e37b4aa106cbdbfffb83883ec2f8e6
2013-05-09 11:17:00 +09:00
2e4bde7398
Import translations. DO NOT MERGE
...
Change-Id: I77a0aed9771ecc28a56226bb5f9776c1e1cf8b4d
Auto-generated-cl: translation import
2013-05-08 13:18:34 -07:00
22e6a5c5b4
Import translations. DO NOT MERGE
...
Change-Id: I189a4ad23e69f0abe515dad7e3c909a28fcfbf0b
Auto-generated-cl: translation import
2013-05-08 13:09:53 -07:00
71d52474fd
Merge "Optimizations and safeguards."
2013-05-08 10:11:49 +00:00
eab27c1ef6
Merge "Add account e-mail addresses to the user dictionary"
2013-05-08 09:53:54 +00:00
9f9cc03277
Optimizations and safeguards.
...
- Don't call finishComposingText when useless.
- Add safeguards against calling setComposingRegion when the
data returned by the editor is inconsistent.
- Cancel pending recorrection messages when new messages arrive.
Bug: 8842941
Bug: 8845001
Change-Id: I939701033cf5c2bbd85871ecf83e329021ddeb91
2013-05-08 18:47:10 +09:00
5b8b76baa3
Merge "Move gesture preview trail parameters to resource"
2013-05-08 09:02:52 +00:00
5648054667
Add account e-mail addresses to the user dictionary
...
Bug: 8683365
Change-Id: Id72540c515e61c3dd854892599645dd6d22b496d
2013-05-08 17:58:21 +09:00
05124d0193
Move gesture preview trail parameters to resource
...
Bug: 7167303
Change-Id: I22b56588dc5a1c9d5eaec3a39b5f32c9e5a8a5b4
2013-05-08 17:51:45 +09:00
faa94a2d0a
Merge "Add owner's info to the dictionary"
2013-05-08 08:31:45 +00:00
fc6d4a5412
Add owner's info to the dictionary
...
Bug: 8683365
Change-Id: I1c30eac128b4172526423ebeeb45bc6cee7fb67b
2013-05-08 17:29:04 +09:00
6435c80087
Merge "Fix an issue on the transition between the setup and the settings"
2013-05-08 08:23:49 +00:00
331d256f21
Fix an issue on the transition between the setup and the settings
...
Bug: 8853220
Change-Id: I99b6c46d900e9391f77986d1ae6e3edeaeff01e5
2013-05-08 15:18:45 +09:00
f59c4f6840
Fix labels in the personal dictionary settings
...
Bug: 8855738
Bug: 8853764
Change-Id: I03383bb5d6d72645f511cc6175dec747eb13a840
2013-05-08 14:58:43 +09:00
244a24e368
Consolidate dummy proximity info to the spell checker info
...
Bug: 8783170
Change-Id: I067486e5ec1ae7cdef8e2121392464ba71ee8add
2013-05-08 11:49:12 +09:00
8064c669fe
Fix looping logic bugs.
...
shiftOut() is getting called once too often through these for loops.
Change-Id: I9a68b49e6cc1469bcddd673ab1567e238cf192b8
2013-05-07 08:33:31 -07:00
104bb70c65
Merge "Avoid drawing too long gesture preview trails"
2013-05-07 11:58:09 +00:00
2afe88b8d7
Merge "Unify space-adding on gestures."
2013-05-07 11:51:01 +00:00
80e396d83c
Avoid drawing too long gesture preview trails
...
Bug: 7167303
Change-Id: I63c2e8fb60f76e80346b67fd44399fa91930f2f0
2013-05-07 20:48:46 +09:00
e8b9b35471
Unify space-adding on gestures.
...
This is much simpler, and more correct.
Bug: 8808497
Change-Id: I7a56bf9d6d9fb481f898b7a9f5898a86c11b34c0
2013-05-07 20:38:09 +09:00
a9dd74cf3f
refactor spell checker
...
Change-Id: Ie7bea23f2ac54f03572e77c31ba7cb3d5e8f8d2f
2013-05-07 20:21:11 +09:00
9d71a6c968
Remove unused device form factor values
...
Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
2013-05-07 18:52:22 +09:00
84ac8f31fb
Move empty listner to KeyboardActionListener.Adapter
...
Change-Id: Ic7bad73c089de015746c667bbfb2c09bd429a9fc
2013-05-07 16:40:15 +09:00
61b6fc7d7b
Clean up unused static variable
...
Change-Id: I51c5903b7716d3927d2ff09a5054725215a626b5
2013-05-07 16:36:32 +09:00
ce67b41661
Record down point as gesture preview trail for sure
...
Change-Id: Ic712a6af8229a9a1aa4a5419d779927f1ef8be67
2013-05-07 15:51:23 +09:00
4ddf1e47a7
Remove unused gesture preview trail code
...
Change-Id: I2aa77675628a4b1655b30852c950f5daae6f0a92
2013-05-07 14:27:34 +09:00
71778d2551
am 34a0dc5a: Import translations. DO NOT MERGE
...
* commit '34a0dc5abe47b28b7ef681b30aa5c94349b57e0d':
Import translations. DO NOT MERGE
2013-05-06 14:03:12 -07:00
Satoshi Kataoka
Kurt Partridge
Tadashi G. Takaoka
Jean Chalard
Baligh Uddin
Ken Wakasa
Jeff Sharkey