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
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
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
66c5f8cbe8
merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
2013-05-14 06:48:58 -07:00
6d0f034701
am b2d53be7: Merge "Remove FeedbackLog instance variables."
...
* commit 'b2d53be740cc1ea6185d59d2b2b749edfc3e914e':
Remove FeedbackLog instance variables.
2013-05-14 06:10:56 -07:00
b2d53be740
Merge "Remove FeedbackLog instance variables."
2013-05-14 13:09:33 +00:00
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
8b56ad7814
Merge "Revise welcome screen video and still image"
2013-05-14 12:01:47 +00:00
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
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
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
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
3fff5179d5
am 41016aca: Back to previous keyboard layout by canceling sliding input
...
* commit '41016acacfa21354f59ed51db1f85ea3d99bf6a4':
Back to previous keyboard layout by canceling sliding input
2013-05-14 04:36:06 -07:00
41016acacf
Back to previous keyboard layout by canceling sliding input
...
Bug: 8915171
Change-Id: Iabdeb7920f67f89246087c3ee06240406ecfbc3d
2013-05-14 20:28:03 +09:00
f46eafe255
am c9398a3b: Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
...
* commit 'c9398a3b399e46aa4fb4de18c4c3d41ffd96e1fa':
Fix PointerTrackerQueue.releaseAllPointerOlderThan
2013-05-13 23:54:26 -07:00
c9398a3b39
Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"
2013-05-14 06:53:15 +00:00
dccad3efa4
am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden
...
* commit 'cb0d1c4c584f3f47da3f630441b7de1e741584e0':
Fix isSuggestionsStripVisible when keyboard hidden
2013-05-13 23:44:59 -07: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
5ec5e0b6f8
am e69066d1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e69066d11bde67d2370ed267d89ff8b421482cce':
Import translations. DO NOT MERGE
2013-05-13 11:37:54 -07:00
e69066d11b
Import translations. DO NOT MERGE
...
Change-Id: I9b70a81c1f507e5e9a2bfdcb179dea1cc03e0517
Auto-generated-cl: translation import
2013-05-13 11:35:25 -07:00
72f51299f9
Import translations. DO NOT MERGE
...
Change-Id: I5e6fa99ba1c520aeb92844c02dd5adb7eaf7227c
Auto-generated-cl: translation import
2013-05-13 11:30:22 -07:00
298d823297
Import translations. DO NOT MERGE
...
Change-Id: I871e96e80b74f5c521d940c4b50fad24488c3c2e
Auto-generated-cl: translation import
2013-05-13 11:28:31 -07:00
1109ab9c65
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-13 05:56:00 -07:00
Kurt Partridge
Tadashi G. Takaoka
Jean Chalard
The Android Automerger
Ken Wakasa
Baligh Uddin