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
Kurt Partridge
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
Kurt Partridge
260df84197
Merge "Remove unused code"
2013-05-10 22:12:11 +00:00
Kurt Partridge
bb17034f64
Merge "Remove ref to LatinImeLogger preference."
2013-05-10 20:41:52 +00:00
Kurt Partridge
4135c2db7b
Merge "Avoid NPE by fixing ResearchLogger initialization"
2013-05-10 15:48:04 +00:00
Tadashi G. Takaoka
565ced4546
Merge "Refactor StringUtils.findPrefixedString to findValueOfKey"
2013-05-10 09:49:07 +00:00
Tadashi G. Takaoka
6d3d2ae064
Refactor StringUtils.findPrefixedString to findValueOfKey
...
Bug: 8556975
Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307
2013-05-10 18:44:04 +09:00
Tadashi G. Takaoka
4705c0fa7c
Fix screen flash when launching settings activity
...
Bug: 8336068
Change-Id: I90a0f259129a3f3319b158b060154cc43960c234
2013-05-10 15:36:24 +09:00
Tadashi G. Takaoka
2b5c9726f4
Introduce another activity to launch setup wizard
...
Bug: 8336068
Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33
2013-05-10 15:30:53 +09:00
Tadashi G. Takaoka
5ffa5bf3ba
Merge "Keep SetupActivity alive to check re-launching from launcher"
2013-05-10 06:24:52 +00:00
Tadashi G. Takaoka
9ed322b40f
Keep SetupActivity alive to check re-launching from launcher
...
Bug: 8336068
Change-Id: I183b8e3fd1b3898d5f8dbbb13a0c93c64341fc38
2013-05-10 15:15:53 +09:00
Jean Chalard
2564bd0937
Merge "Reuse old preferences if possible."
2013-05-10 05:56:32 +00:00
Jean Chalard
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
Satoshi Kataoka
ba35426f01
Merge "Tweak a label in the personal dictionary settings"
2013-05-10 03:27:51 +00:00
Tadashi G. Takaoka
2ad7023c54
Fix detecting out of keyboard area
...
Bug: 8885165
Change-Id: I85c78b23955169972fb0f5395463b6fe47f12c9c
2013-05-10 12:16:44 +09:00
Satoshi Kataoka
4c6a5c0428
Tweak a label in the personal dictionary settings
...
Bug: 8897600
Change-Id: Ibf245e32468e5740ad9d65b8ff1f1e87b430d287
2013-05-10 12:14:22 +09:00
Kurt Partridge
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
Kurt Partridge
011634163c
Remove unused code
...
Change-Id: I192c67e9e8de44f073abc70ec85ebcdb36356c2e
2013-05-09 14:36:40 -07:00
Kurt Partridge
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
Baligh Uddin
8dafc8e834
am 22e6a5c5: Import translations. DO NOT MERGE
...
* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415':
Import translations. DO NOT MERGE
2013-05-09 08:52:51 -07:00
Baligh Uddin
42dc0c2562
Merge "Import translations. DO NOT MERGE"
2013-05-09 15:52:00 +00:00
Satoshi Kataoka
341f1b237b
Tweak gesture debug
...
Change-Id: Iea11a095adb15fbf4be38f34542119f8bc7bcbff
2013-05-09 20:08:50 +09:00
Satoshi Kataoka
52cb409ac2
Don't resize debug array if production
...
Bug: 8556775
Change-Id: I46a10f8dc938cab493933f0f2b4e1f7779b24f6f
2013-05-09 19:22:24 +09:00
Satoshi Kataoka
b2c4c73064
Add debug facilities for gesture
...
Bug: 8556775
Change-Id: I9069b2b44356bbae9fa4aaf0b99c3d723a8c9c58
2013-05-09 19:19:11 +09:00
Satoshi Kataoka
b902109000
Fix usages of getEnabledInputMethodSubtypeList
...
Bug: 8450279
Change-Id: Ib8433442ae6ca6c28da2652bff687cdeaf7c196e
2013-05-09 17:07:19 +09:00
Tadashi G. Takaoka
499cea949d
Use revised Google Keyboard icon
...
Bug: 8159728
Change-Id: I458df60cb39f81cde3c08190af0ab08d304f9d98
2013-05-09 11:50:39 +09:00
Tadashi G. Takaoka
3e37586316
Launch setup wizard as single top activity
...
Bug: 8336068
Change-Id: Ifac84361e4e37b4aa106cbdbfffb83883ec2f8e6
2013-05-09 11:17:00 +09:00
Baligh Uddin
2e4bde7398
Import translations. DO NOT MERGE
...
Change-Id: I77a0aed9771ecc28a56226bb5f9776c1e1cf8b4d
Auto-generated-cl: translation import
2013-05-08 13:18:34 -07:00