Commit graph

32833 commits

Author SHA1 Message Date
Yohei Yukawa
36dfb6d1a4 Fix build breakage caused by I0218dd07
BUG: 11746191
Change-Id: I0b693c4b22793f6e8fd77a9f045f205aa8fe4050
2014-04-08 20:00:16 +09:00
Yohei Yukawa
df34e53a69 am c9539f42: Merge "Add StatsUtils for checking state"
* commit 'c9539f42f6a0c2f591fb2ed688a9303d097a463b':
  Add StatsUtils for checking state
2014-04-08 10:27:40 +00:00
Yohei Yukawa
c9539f42f6 Merge "Add StatsUtils for checking state" 2014-04-08 10:23:41 +00:00
Tadashi G. Takaoka
dbdc492235 am 8afe2189: Merge "Use locale to look up KeyboardTextsTable"
* commit '8afe218954d5ac73acf4bda1636a722f9347abaf':
  Use locale to look up KeyboardTextsTable
2014-04-08 10:20:48 +00:00
Tadashi G. Takaoka
8afe218954 Merge "Use locale to look up KeyboardTextsTable" 2014-04-08 10:18:17 +00:00
Tadashi G. Takaoka
6bb3556ff7 Use locale to look up KeyboardTextsTable
Change-Id: I1e05c7fdbb757efef0e9407dc25482ef1115e49a
2014-04-08 19:12:31 +09:00
Yohei Yukawa
dc0f7ca167 Add StatsUtils for checking state
BUG: 11746191
Change-Id: I0218dd07dde1d09321009ea1497258fc4235a1e8
2014-04-08 19:09:49 +09:00
Keisuke Kuroyanagi
b06548851a am ee6392f5: Merge "Separate unigram/bigram property from WordProperty."
* commit 'ee6392f5a6d7c41b562e5e3946ce74cf0b3c88a1':
  Separate unigram/bigram property from WordProperty.
2014-04-08 09:45:20 +00:00
Keisuke Kuroyanagi
ee6392f5a6 Merge "Separate unigram/bigram property from WordProperty." 2014-04-08 09:42:24 +00:00
Tadashi G. Takaoka
daf200be27 am 465a2ac5: Refactor make-keyboard-text
* commit '465a2ac534bf5c0dea38608dbe713ed3a9dc84eb':
  Refactor make-keyboard-text
2014-04-08 09:42:05 +00:00
Keisuke Kuroyanagi
e41b2ed8d3 Separate unigram/bigram property from WordProperty.
Bug: 13406708

Change-Id: I48e9fccedd9dcdc1a35ffe027745b58966a83315
2014-04-08 18:24:06 +09:00
Tadashi G. Takaoka
465a2ac534 Refactor make-keyboard-text
Change-Id: Ifaf955ae896a18e5cbc9c1af5a1b7e15942eb886
2014-04-08 17:11:06 +09:00
Tadashi G. Takaoka
6ed9f4d74b am 113523d2: Merge "Update KeyboardTextsTable.java"
* commit '113523d22db3b183203abe475baebbc6ad0c486c':
  Update KeyboardTextsTable.java
2014-04-08 07:45:31 +00:00
Tadashi G. Takaoka
113523d22d Merge "Update KeyboardTextsTable.java" 2014-04-08 07:40:19 +00:00
Tadashi G. Takaoka
ceda8b925f Update KeyboardTextsTable.java
Change-Id: I821eb214f3a8c34e91ca9bbf116cc53389a2fff0
2014-04-08 16:16:05 +09:00
Tadashi G. Takaoka
61319558de am 1b1732be: Merge "Use Quantum.Light theme for API 20 or later"
* commit '1b1732be5b771ee0295bbe7a7cc034baba7ae503':
  Use Quantum.Light theme for API 20 or later
2014-04-08 03:28:27 +00:00
Tadashi G. Takaoka
1b1732be5b Merge "Use Quantum.Light theme for API 20 or later" 2014-04-08 03:24:28 +00:00
Tadashi G. Takaoka
0d76807dee am f1f29799: Merge "Add "preliminary" comment to hindi_compact subtype"
* commit 'f1f297999446ebdce1afb2543641c2a4f1e3cd3f':
  Add "preliminary" comment to hindi_compact subtype
2014-04-08 02:40:33 +00:00
Tadashi G. Takaoka
f1f2979994 Merge "Add "preliminary" comment to hindi_compact subtype" 2014-04-08 02:35:15 +00:00
Tadashi G. Takaoka
aff1fcb43f Add "preliminary" comment to hindi_compact subtype
Hindi (Compact) input should be marked as "preliminary" until a
combining input logic for that subtype is implemented.

Bug: 13779052
Change-Id: Iae5be2cc24507d7533ca1dd56b18cd80818a8cf1
2014-04-08 11:32:37 +09:00
Baligh Uddin
0e52441926 am 4a43b493: (-s ours) Import translations. DO NOT MERGE
* commit '4a43b4935553ba6322640eca954ab784629ef852':
  Import translations. DO NOT MERGE
2014-04-08 02:30:58 +00:00
Tadashi G. Takaoka
a1df9ef753 Use Quantum.Light theme for API 20 or later
Bug: 13698528
Change-Id: Ibf03b3eedbd07e986d7d206bfd3803108dbbe6d5
2014-04-08 11:23:47 +09:00
Baligh Uddin
4a43b49355 Import translations. DO NOT MERGE
Change-Id: Idd39b817c682589b998fb5955f65f7bce8843058
Auto-generated-cl: translation import
2014-04-07 15:35:08 -07:00
Baligh Uddin
f60c47a91a Import translations. DO NOT MERGE
Change-Id: I770f91288581cb143d4729b8ee6000634c9d75f0
Auto-generated-cl: translation import
2014-04-07 15:34:10 -07:00
The Android Automerger
46ca9781e3 merge in master-release history after reset to master 2014-04-07 05:49:54 -07:00
Tadashi G. Takaoka
f19ea2f2c8 am a857235d: Merge "Remove workaround code of placing DrawingPreviewPlacerView"
* commit 'a857235d0c2d56f92502d76460325377170ee5b8':
  Remove workaround code of placing DrawingPreviewPlacerView
2014-04-07 09:03:53 +00:00
Tadashi G. Takaoka
a857235d0c Merge "Remove workaround code of placing DrawingPreviewPlacerView" 2014-04-07 08:58:20 +00:00
Jean Chalard
3d972f85d2 am da5c2069: Merge "[CB23] Merge add and deleteLast"
* commit 'da5c20693421d087c56707c95edcf19fc153c12a':
  [CB23] Merge add and deleteLast
2014-04-07 08:42:15 +00:00
Tadashi G. Takaoka
0c01fc6f1c Remove workaround code of placing DrawingPreviewPlacerView
This CL divides MainKeyboardView.locatePreviewPlacerView method into
two methods. One is installing DrawingPreviewPlacerView to the window
as Frontmost view. Another is telling the location of MainKeyboardView
to DrawingPreviewPlacerView. Thus we can eliminate workaround code to
deal with transient states in orientation change.

Change-Id: Ia5d8f28dfb5213d27aa218c72d838a3c3be5a527
2014-04-07 17:36:53 +09:00
Jean Chalard
da5c206934 Merge "[CB23] Merge add and deleteLast" 2014-04-07 08:16:36 +00:00
Jean Chalard
b4ff95b3e3 am b724617b: Merge "[CB22] Merge add and delete"
* commit 'b724617b41accc60ee12eb200d3b712c7a910997':
  [CB22] Merge add and delete
2014-04-07 07:02:24 +00:00
Jean Chalard
b724617b41 Merge "[CB22] Merge add and delete" 2014-04-07 06:59:07 +00:00
Jean Chalard
d52bec0069 [CB23] Merge add and deleteLast
Bug: 13406701
Change-Id: Id9a2e4144b1908ad27d78228ee19e6fc4d4d669f
2014-04-07 15:51:44 +09:00
Jean Chalard
633e4f4533 [CB22] Merge add and delete
...but this time, it works.

Bug: 13406701
Change-Id: Iaa00339a6be76413ffaeb74ff1556e15b3bb039d
2014-04-07 15:47:01 +09:00
Ken Wakasa
42e0f1fcd5 am df801928: Merge "s/stdint.h/cstdint/"
* commit 'df8019285868e8d9d9769d282df9d81bca26a95b':
  s/stdint.h/cstdint/
2014-04-07 05:12:31 +00:00
Ken Wakasa
df80192858 Merge "s/stdint.h/cstdint/" 2014-04-07 05:09:24 +00:00
Tadashi G. Takaoka
0bdf719748 am b6c70f4e: Remove unneeded CustomViewPager class
* commit 'b6c70f4ed31410eb33cd43e316a53067517c1fe3':
  Remove unneeded CustomViewPager class
2014-04-07 03:57:32 +00:00
Tadashi G. Takaoka
b6c70f4ed3 Remove unneeded CustomViewPager class
Originally this hacky class has been introduced by I0824f82c30 to
address bug: 11721001.  Because the bug: 11721001 has been addressed
by I950f13ec40 and etc., this class should be removed.

Bug: 13665882
Change-Id: Iabdd369e4dddb0188534289eea1269fb196895eb
2014-04-07 12:41:51 +09:00
Ken Wakasa
cafab169cd s/stdint.h/cstdint/
Somehow, we were not able to use cstdint gcc target build. That's no
longer the case with Clang.

Removed unnecessary header inclusions too.

Change-Id: Ic83a4adf696f1d5ec7a9809253f3c95804e622e1
2014-04-07 12:39:07 +09:00
The Android Automerger
32351c1800 merge in master-release history after reset to master 2014-04-05 05:51:43 -07:00
Ken Wakasa
6d7cec10c6 am e2e41dc2: Merge "Revert "[CB22] Merge add and delete""
* commit 'e2e41dc22c3558697dae0ad89a03ce54ee206b9f':
  Revert "[CB22] Merge add and delete"
2014-04-04 18:29:04 +00:00
Ken Wakasa
e2e41dc22c Merge "Revert "[CB22] Merge add and delete"" 2014-04-04 18:26:06 +00:00
Ken Wakasa
ef0498a8cc Revert "[CB22] Merge add and delete"
This reverts commit f6bce235ae.

Seeing several new unit test failures after this CL. Reverting..

Change-Id: Ie97127550ee36dd4a07a36701e9c5118684dfbc5
2014-04-04 18:25:34 +00:00
Baligh Uddin
64a4e35d24 am a179f0a3: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'a179f0a33f49efdba59cbd5c810ab5a22d6cdf70':
  Import translations. DO NOT MERGE
2014-04-04 14:51:02 +00:00
Baligh Uddin
99c57caa84 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2014-04-04 14:45:26 +00:00
Baligh Uddin
a179f0a33f Merge "Import translations. DO NOT MERGE" 2014-04-04 14:45:23 +00:00
Ken Wakasa
68e50c287e am dcc43891: Merge "Remove redundant LOCAL_IS_HOST_MODULE assignments"
* commit 'dcc43891e76eb3b6c1674705be60c5798bd16386':
  Remove redundant LOCAL_IS_HOST_MODULE assignments
2014-04-04 13:46:48 +00:00
Ken Wakasa
dcc43891e7 Merge "Remove redundant LOCAL_IS_HOST_MODULE assignments" 2014-04-04 13:43:49 +00:00
Jean Chalard
40f33edaf1 am f9516b00: Merge "[IL132] Remove some calls that let a value escape."
* commit 'f9516b00ecf25e634e2ebfe8ea35eb09bbcf5ca9':
  [IL132] Remove some calls that let a value escape.
2014-04-04 13:38:17 +00:00
Jean Chalard
f9516b00ec Merge "[IL132] Remove some calls that let a value escape." 2014-04-04 13:33:26 +00:00