Commit Graph

7308 Commits (b4b72d438b76e10e7e609f0d2a493ccf09ebb9e4)

Author SHA1 Message Date
Tadashi G. Takaoka 05aa5e75f3 am 48002809: am 2b5c9726: Introduce another activity to launch setup wizard
* commit '480028095509458aeca91d6c887f7a01aec02774':
  Introduce another activity to launch setup wizard
2013-05-15 12:52:53 -07:00
Tadashi G. Takaoka 82e3ea9505 am e7de0ce7: am 5ffa5bf3: Merge "Keep SetupActivity alive to check re-launching from launcher"
* commit 'e7de0ce7411faec1b9bcfc07bdffe5c59856d928':
  Keep SetupActivity alive to check re-launching from launcher
2013-05-15 12:52:51 -07:00
Jean Chalard 28eab9d57c am 07905b6a: am 2564bd09: Merge "Reuse old preferences if possible."
* commit '07905b6a0a3e67ffc5a803ddbe863c2c101846fe':
  Reuse old preferences if possible.
2013-05-15 12:52:50 -07:00
Satoshi Kataoka 1884044eb7 am 81662dd4: am ba35426f: Merge "Tweak a label in the personal dictionary settings"
* commit '81662dd41e6eb39f89d7f1a3779e31f164e3e002':
  Tweak a label in the personal dictionary settings
2013-05-15 12:52:48 -07:00
Tadashi G. Takaoka 1cb72a0939 am 384d4e5b: am 2ad7023c: Fix detecting out of keyboard area
* commit '384d4e5b5da940b1620c5b4da2b938a9134ed2ea':
  Fix detecting out of keyboard area
2013-05-15 12:52:47 -07:00
Satoshi Kataoka 32866cebf1 am 2a383bfe: am 341f1b23: Tweak gesture debug
* commit '2a383bfebd16c82473ddf1c5203e5bc2d68282d5':
  Tweak gesture debug
2013-05-15 12:47:08 -07:00
Satoshi Kataoka 41b21c470f am 45c925a9: am 52cb409a: Don\'t resize debug array if production
* commit '45c925a9be45ddfd9901c44f1e2dec46d22ff84e':
  Don't resize debug array if production
2013-05-15 12:47:07 -07:00
Satoshi Kataoka 99cccf3dd0 am 7f9b3e62: am b2c4c730: Add debug facilities for gesture
* commit '7f9b3e6286ad78594d68a44c90d01062109b0320':
  Add debug facilities for gesture
2013-05-15 12:47:05 -07:00
Satoshi Kataoka f5bb523125 am a8254f73: am b9021090: Fix usages of getEnabledInputMethodSubtypeList
* commit 'a8254f73c27202f8db27c1e93816963a4634eabb':
  Fix usages of getEnabledInputMethodSubtypeList
2013-05-15 12:47:04 -07:00
Tadashi G. Takaoka e8f68d2295 am 14c0e4e7: am 499cea94: Use revised Google Keyboard icon
* commit '14c0e4e782f45d51082e8822b4520f7805a5ec80':
  Use revised Google Keyboard icon
2013-05-15 12:47:03 -07:00
Tadashi G. Takaoka 3da7bdd34e am e868922e: am 3e375863: Launch setup wizard as single top activity
* commit 'e868922edcbdf0df9ac2695c63384efa32629e07':
  Launch setup wizard as single top activity
2013-05-15 12:47:01 -07:00
Jean Chalard 29177deb55 am 114ec4ac: am 71d52474: Merge "Optimizations and safeguards."
* commit '114ec4ac9f2731419b6e1167067a4baffbefa6ea':
  Optimizations and safeguards.
2013-05-15 12:47:00 -07:00
Satoshi Kataoka e3ca68aa51 am 9e5d7abe: am eab27c1e: Merge "Add account e-mail addresses to the user dictionary"
* commit '9e5d7abe33fcf68ef74fde6851ea6dd99beb5141':
  Add account e-mail addresses to the user dictionary
2013-05-15 12:46:57 -07:00
Tadashi G. Takaoka bd2aca0b77 am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource"
* commit 'c614357468c496db420c7b1d0a8a119f86620f8a':
  Move gesture preview trail parameters to resource
2013-05-15 12:46:56 -07:00
Satoshi Kataoka 1c7a15b508 am eecf34a9: am faa94a2d: Merge "Add owner\'s info to the dictionary"
* commit 'eecf34a9be6ffb20635d0807f16f9fe131cf7f63':
  Add owner's info to the dictionary
2013-05-15 12:46:54 -07:00
Satoshi Kataoka 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
Satoshi Kataoka 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
Satoshi Kataoka 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
Kurt Partridge 8facddba7d am 9b5965d4: am 1eb1af75: Merge "Fix looping logic bugs."
* commit '9b5965d452d55fd271dc14f2328b44da08c3cb67':
  Fix looping logic bugs.
2013-05-15 12:46:48 -07:00
Tadashi G. Takaoka 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
Jean Chalard 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
Satoshi Kataoka 4334809ff6 am 1e7c0677: am a9dd74cf: refactor spell checker
* commit '1e7c067770b6406c762974406013db24561c2416':
  refactor spell checker
2013-05-15 12:46:41 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Baligh Uddin 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
Jean Chalard 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
Jean Chalard 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
Baligh Uddin 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
Tadashi G. Takaoka 1e08d3d259 am 6191026c: am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class"
* commit '6191026ce4e4cc756f47135223f58318d35d3143':
  Introduce MoreSuggestionsListener class
2013-05-15 11:26:02 -07:00
Satoshi Kataoka d53fb22a97 am fcfa2cb2: am 6314b845: Merge "Add permissions for personalization"
* commit 'fcfa2cb24fe4151e28574d3da4397bcc04f3d50a':
  Add permissions for personalization
2013-05-15 11:26:00 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Ken Wakasa 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
Tadashi G. Takaoka 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
Jean Chalard 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
Satoshi Kataoka 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
Jean Chalard 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
Tadashi G. Takaoka 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
Jean Chalard 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
Jeff Sharkey f892099b3e am 238748d5: am 7a800e79: Merge "Avoid leaking AssetFileDescriptor."
* commit '238748d57c8ba770be4c3e34fa6d704893de3d07':
  Avoid leaking AssetFileDescriptor.
2013-05-15 11:17:59 -07:00
Jean Chalard 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
Jean Chalard 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
Jean Chalard 33ccdd1cda am b312f4a8: am ae577ac1: Merge "Update dictionaries"
* commit 'b312f4a8f78f423c5507785f5fbf79d6c786e5bc':
  Update dictionaries
2013-05-15 11:05:20 -07:00
Jean Chalard 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Jean Chalard e7c5c8f6fd am 55d80e4f: am e8ed5d88: Delete obsolete dictionaries
* commit '55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e':
  Delete obsolete dictionaries
2013-05-15 11:05:07 -07:00
Jean Chalard 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
Jean Chalard 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
Jean Chalard 4746093c3c am a9b0c4fb: am 1ff8b1ce: Merge "Update dictionaries"
* commit 'a9b0c4fb9d0247ccdc92984de2d972136a8d34bb':
  Update dictionaries
2013-05-15 11:05:01 -07:00
Satoshi Kataoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Jean Chalard 511432b23c am ba4677fe: am df3ca042: Fix deleting a dictionary
* commit 'ba4677fe0b47aa17ac2a5856d9e71c83eaa71c40':
  Fix deleting a dictionary
2013-05-15 11:04:52 -07:00
Jean Chalard 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
Jean Chalard 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
Tadashi G. Takaoka 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
Jean Chalard 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
Jean Chalard 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
Jean Chalard 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
Satoshi Kataoka 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
Jean Chalard 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
Jean Chalard 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
Jean Chalard 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
Jean Chalard 454962153d am 77bcc98a: am 80790d78: Merge "[PB3] Simplify storage"
* commit '77bcc98ab2f1d3c9b62ee62c1eb4e3fa87f47967':
  [PB3] Simplify storage
2013-05-15 10:59:05 -07:00
Jean Chalard 49ab021b38 am e52eb1f7: am 776edcfe: Merge "[PB2] Small bugfix"
* commit 'e52eb1f706c5f9e6424081395f089f0e30a2ee44':
  [PB2] Small bugfix
2013-05-15 10:59:01 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Satoshi Kataoka 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
Tadashi G. Takaoka 7710c9d59f am ceb3f293: am 0e96003e: Merge "Refactor SetupStepGroup"
* commit 'ceb3f293f010ae75ed5d3d3715a2807537e8b614':
  Refactor SetupStepGroup
2013-05-15 10:58:53 -07:00
Tadashi G. Takaoka 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
Jean Chalard 1f4b748196 am 6a355d2d: am 197a2d32: Merge "[PB1] Cleanup"
* commit '6a355d2d189388833148cf3850429b38d57ae9e9':
  [PB1] Cleanup
2013-05-15 10:58:49 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Jean Chalard 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
Satoshi Kataoka 874c4fda36 am 434abe45: am 9b4e3db1: Legal notice
* commit '434abe450c8fd65789b6f8b04d62ad98287115dd':
  Legal notice
2013-05-15 10:53:02 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Kurt Partridge 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
Jean Chalard 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
Jean Chalard 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Jean Chalard 52e0b3d1b8 am 0e64fbbc: am 9cf46864: Update dictionaries
* commit '0e64fbbcac7116c410143796937e4e5ef1238c83':
  Update dictionaries
2013-05-15 10:46:54 -07:00
Tadashi G. Takaoka a06fdaadae am 64e87b3e: am 0b2d184a: Merge "Update setup wizard icons"
* commit '64e87b3e660199b5dd7539fe413146e4dfbf977f':
  Update setup wizard icons
2013-05-15 10:46:52 -07:00
Kurt Partridge 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
Baligh Uddin 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
Kurt Partridge b1767bc433 am 40070707: am 7a172175: Merge "Fix user recording dialog"
* commit '40070707d83fb2a105292a0683fa22a1094e58fe':
  Fix user recording dialog
2013-05-15 10:36:46 -07:00
Kurt Partridge 5abe65f1da am 72ca59bc: am 0833b3cb: Merge "Fix alarm bug"
* commit '72ca59bc2a29eaadf0b557995a137c8f682d82bb':
  Fix alarm bug
2013-05-15 10:36:44 -07:00
Kurt Partridge 453b371d2f am 1019c630: am a1913301: Merge "Avoid duplicate MotionEvents"
* commit '1019c630fafd4bffd3fb51a0b83dfc532dcd5306':
  Avoid duplicate MotionEvents
2013-05-15 10:36:42 -07:00
Kurt Partridge 10270196c8 am a2a29050: am b903f103: Merge "Label logUnits after LatinImeOnEndBatchInput"
* commit 'a2a2905033d37784b84191eec8d1efa3cd5b4819':
  Label logUnits after LatinImeOnEndBatchInput
2013-05-15 10:36:39 -07:00
Kurt Partridge 86b2c57c47 am f5864fbb: am a5bfac5b: Merge "Fix NPE"
* commit 'f5864fbb7a8703cb44a6e7bd77d7031ee271db12':
  Fix NPE
2013-05-15 10:36:37 -07:00
Kurt Partridge 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
Kurt Partridge 22c706aa36 am a9c2ff1b: am e9e4fe52: Merge "Fix logic error"
* commit 'a9c2ff1b236624e7aefeecb2dbd2829e8217130c':
  Fix logic error
2013-05-15 10:36:26 -07:00
Kurt Partridge 4a885f254d am b20c7ee7: am 1f99e04b: Merge "Fix JsonWriter bug"
* commit 'b20c7ee75093ae9c111daf64d9e4f8509d692824':
  Fix JsonWriter bug
2013-05-15 10:36:24 -07:00
Kurt Partridge 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
Kurt Partridge 21a2cfca20 am abc8d564: am dd8c87a3: Merge "Include nanoTime in filename"
* commit 'abc8d564eb0674887b5b1ebae3c1029935f4bb7b':
  Include nanoTime in filename
2013-05-15 10:36:20 -07:00
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 6dd2130d84 am 2101ba41: am 888a194c: Fix missing AudioAndHapticFeedbackManager initialization
* commit '2101ba410c4fd12919b3b84e4e6bcc61b1897e70':
  Fix missing AudioAndHapticFeedbackManager initialization
2013-05-15 10:36:12 -07:00
Jean Chalard 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Tadashi G. Takaoka 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
Jean Chalard f1dcf72506 Merge "Don't process recorrection or resets when not shown" 2013-05-15 11:25:25 +00:00
Jean Chalard c9aaba1253 Don't process recorrection or resets when not shown
Bug: 8954116
Change-Id: Ica27dbfc570643bb81e6cdf34cc7c796ea080d71
2013-05-15 20:20:20 +09:00
Tadashi G. Takaoka 96a9f357c7 Merge "Fix unintentional setup step advance in orientation change" 2013-05-15 10:52:21 +00:00
Tadashi G. Takaoka 9b4a883e09 Fix unintentional setup step advance in orientation change
Bug: 8159728
Change-Id: I53e7d7c8fb5cc231ea94474b091e550f77ae8dab
2013-05-15 19:50:35 +09:00
Tadashi G. Takaoka 50259c70d7 Merge "Tune layout parameters of setup wizard" 2013-05-15 10:13:24 +00:00
Tadashi G. Takaoka 66b87269e1 Update welcome fallback image (using xhdpi asset)
Bug: 8159728
Change-Id: Ifd7339c7db305de424109b6adb126b354028b3aa
2013-05-15 18:36:13 +09:00
Tadashi G. Takaoka 86ee98dd55 Revert "Update welcome fallback image"
This reverts commit c1ff8d7d3f

Change-Id: Ib1f374f48adb436c0b6023aa5052e6340c410df7
2013-05-15 18:32:03 +09:00
Tadashi G. Takaoka 786bc9d46f Tune layout parameters of setup wizard
Bug: 8159728
Change-Id: Ifb08b62e11008ad56715a07825c0fbc719130ebd
2013-05-15 17:49:56 +09:00
Tadashi G. Takaoka 769427cff2 Adjust aspect ratio of setup image
Bug: 8159728
Change-Id: I578014912fa63c4c9b4c2c89aeae7ffec836b06c
2013-05-15 14:48:27 +09:00
Tadashi G. Takaoka c1ff8d7d3f Update welcome fallback image
Bug: 8159728
Change-Id: I0306efe99aa8db97ec6a1888240f0538480ebea5
2013-05-15 10:41:08 +09:00
Kurt Partridge 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
Kurt Partridge 7b0a148951 Merge "Rename a var to match semantics" 2013-05-14 16:11:07 +00:00
Kurt Partridge 3e8df13cd7 Add claifying comment
This is a follow-up to I7c01c3dd3ac33d7e96c00836256bae9c14b124ed

Change-Id: I9e3f8968c4bbf9525d5dfe101f71373c42f88361
2013-05-14 09:10:22 -07:00
Kurt Partridge b2d53be740 Merge "Remove FeedbackLog instance variables." 2013-05-14 13:09:33 +00:00
Tadashi G. Takaoka 8b56ad7814 Merge "Revise welcome screen video and still image" 2013-05-14 12:01:47 +00:00
Tadashi G. Takaoka 7348d9fb72 Revise welcome screen video and still image
Bug: 8159728
Change-Id: Ief8d7197879d24ccef529e975c23d6f11c7aa458
2013-05-14 20:56:09 +09:00
Ken Wakasa d78c776b7b Merge "Adjust sampling interval for gesture stroke drawing a bit." 2013-05-14 11:55:33 +00:00
Ken Wakasa 5a6827dbff Adjust sampling interval for gesture stroke drawing a bit.
bug: 7167303

Change-Id: I45ca9d31cf4f8492dde367f997d8e36f4a07cffe
2013-05-14 20:53:12 +09:00
Ken Wakasa d6d70e7325 Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden"" 2013-05-14 11:46:04 +00:00
Ken Wakasa 3efa36f6aa Revert "Fix isSuggestionsStripVisible when keyboard hidden"
This reverts commit cb0d1c4c58

Change-Id: Ie2c8e01c25bd051b6157e8f32ab84392a0c7252a
bug: 8954116
2013-05-14 11:44:22 +00:00
Tadashi G. Takaoka 41016acacf Back to previous keyboard layout by canceling sliding input
Bug: 8915171
Change-Id: Iabdeb7920f67f89246087c3ee06240406ecfbc3d
2013-05-14 20:28:03 +09:00
Tadashi G. Takaoka c9398a3b39 Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan" 2013-05-14 06:53:15 +00:00
Tadashi G. Takaoka 979fb7415b Fix PointerTrackerQueue.releaseAllPointerOlderThan
Change-Id: If353869720895ee5355079c15c724132762dd70c
2013-05-14 15:32:21 +09:00
Jean Chalard 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
Kurt Partridge 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
Kurt Partridge 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
Baligh Uddin e69066d11b Import translations. DO NOT MERGE
Change-Id: I9b70a81c1f507e5e9a2bfdcb179dea1cc03e0517
Auto-generated-cl: translation import
2013-05-13 11:35:25 -07:00
Tadashi G. Takaoka b121538e0c Tune maximum keypress duration to 100 milliseconds
Bug: 8556975
Change-Id: If7839c5764f7a269243a9570c0b7782b6f7ee73b
2013-05-13 20:04:59 +09:00