Commit Graph

14403 Commits (e203961dd6fa590fe5946a4b06f55a81218c2290)

Author SHA1 Message Date
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
Tadashi G. Takaoka e4bd4c4465 am cc8733ef: am edc49d38: Fix bug to update last interpolated index of GestureStroke
* commit 'cc8733ef71ddd369dbd48ac1b7336fb42af813e6':
  Fix bug to update last interpolated index of GestureStroke
2013-05-15 10:36:10 -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 ce3b16a2f1 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 04:26:29 -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 19e7c3b647 am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
* commit '96a9f357c7e2a059687926cd7cd52ac5d06bc65e':
  Fix unintentional setup step advance in orientation change
2013-05-15 03:54:15 -07: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 d68a25328c am 50259c70: Merge "Tune layout parameters of setup wizard"
* commit '50259c70d7754569a7b552cfc6ef8a034b5b0d40':
  Tune layout parameters of setup wizard
2013-05-15 03:14:51 -07:00
Tadashi G. Takaoka 50259c70d7 Merge "Tune layout parameters of setup wizard" 2013-05-15 10:13:24 +00:00
Tadashi G. Takaoka a5df7bea50 am 66b87269: Update welcome fallback image (using xhdpi asset)
* commit '66b87269e16a0ed4b13a58bca5dd3a41318ad241':
  Update welcome fallback image (using xhdpi asset)
2013-05-15 03:01:11 -07:00
Tadashi G. Takaoka 0071bdb12e am 86ee98dd: Revert "Update welcome fallback image"
* commit '86ee98dd55e464ace479a9855a06a99ed1a2a61a':
  Revert "Update welcome fallback image"
2013-05-15 02:43:27 -07: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 c52793c076 am 769427cf: Adjust aspect ratio of setup image
* commit '769427cff24944958f5f1f6179090a86444f3eab':
  Adjust aspect ratio of setup image
2013-05-14 22:57:05 -07: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 69e83866a0 am c1ff8d7d: Update welcome fallback image
* commit 'c1ff8d7d3f35aa776c93373aa5747bb92f1484bf':
  Update welcome fallback image
2013-05-14 19:21:28 -07: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 f431ddcdb1 am 7b0a1489: Merge "Rename a var to match semantics"
* commit '7b0a14895100c4af8b6ed8b33f8885f77cccf62c':
  Rename a var to match semantics
2013-05-14 11:05:24 -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
The Android Automerger 66c5f8cbe8 merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle 2013-05-14 06:48:58 -07:00
Kurt Partridge 6d0f034701 am b2d53be7: Merge "Remove FeedbackLog instance variables."
* commit 'b2d53be740cc1ea6185d59d2b2b749edfc3e914e':
  Remove FeedbackLog instance variables.
2013-05-14 06:10:56 -07:00
Kurt Partridge b2d53be740 Merge "Remove FeedbackLog instance variables." 2013-05-14 13:09:33 +00:00
Tadashi G. Takaoka 4e3a8afd17 am 8b56ad78: Merge "Revise welcome screen video and still image"
* commit '8b56ad7814455f3b5e1c012aea9a5e02153ab199':
  Revise welcome screen video and still image
2013-05-14 05:03:19 -07:00
Tadashi G. Takaoka 8b56ad7814 Merge "Revise welcome screen video and still image" 2013-05-14 12:01:47 +00:00
Ken Wakasa 23bfac83c2 am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit."
* commit 'd78c776b7b900a8525daa0e2a455a596d4663848':
  Adjust sampling interval for gesture stroke drawing a bit.
2013-05-14 04:57:00 -07: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 2e0fc8bf33 am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""
* commit 'd6d70e7325d9667e2780a150015802af232e997d':
  Revert "Fix isSuggestionsStripVisible when keyboard hidden"
2013-05-14 04:47:37 -07: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