Commit graph

33123 commits

Author SHA1 Message Date
The Android Automerger
2d9642e33e merge in master-release history after reset to master 2014-03-27 05:50:48 -07:00
Keisuke Kuroyanagi
62e4acb271 am 618a949f: Merge "Use SuggestionResults to get suggestion."
* commit '618a949f9dd751236b4d74d293ca401002bad59d':
  Use SuggestionResults to get suggestion.
2014-03-27 12:11:45 +00:00
Keisuke Kuroyanagi
618a949f9d Merge "Use SuggestionResults to get suggestion." 2014-03-27 12:07:28 +00:00
Keisuke Kuroyanagi
d73edf23ac Use SuggestionResults to get suggestion.
Bug: 8187060
Bug: 13333066
Change-Id: I435096ecf8422453f9b167adb0ca3b9c8a840018
2014-03-27 20:05:33 +09:00
Ken Wakasa
96faf323d8 am ff2456c8: Merge "Use Clang for dicttool"
* commit 'ff2456c8009cb4b5cdcc69a4e81d872981860a15':
  Use Clang for dicttool
2014-03-27 10:26:33 +00:00
Ken Wakasa
ff2456c800 Merge "Use Clang for dicttool" 2014-03-27 10:21:30 +00:00
Ken Wakasa
96092ebd78 Use Clang for dicttool
Fix the wrong shared lib name too.

Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
2014-03-27 19:14:37 +09:00
Keisuke Kuroyanagi
d8257a889a am 2426bc29: Merge "Remove DicNodeUtils::appendTwoWords()."
* commit '2426bc2943af97ef8d6936842be7b2b6708522a3':
  Remove DicNodeUtils::appendTwoWords().
2014-03-27 09:54:27 +00:00
Keisuke Kuroyanagi
2426bc2943 Merge "Remove DicNodeUtils::appendTwoWords()." 2014-03-27 09:49:50 +00:00
Jean Chalard
7e92d2d3b5 am 080e0253: Merge "Revert "[CB15] Remove a redundant variable.""
* commit '080e0253ae9d725a328b54c4771b9838699ffc7a':
  Revert "[CB15] Remove a redundant variable."
2014-03-27 09:49:03 +00:00
Jean Chalard
5a4cb0e3f8 am f459ccf4: Merge "Revert "[CB16] Remove unused stuff""
* commit 'f459ccf4f663d74ce43c57e9b9af9251ee0c48a1':
  Revert "[CB16] Remove unused stuff"
2014-03-27 09:49:02 +00:00
Jean Chalard
080e0253ae Merge "Revert "[CB15] Remove a redundant variable."" 2014-03-27 09:44:31 +00:00
Jean Chalard
f459ccf4f6 Merge "Revert "[CB16] Remove unused stuff"" 2014-03-27 09:44:24 +00:00
Jean Chalard
75715f7d9f Revert "[CB15] Remove a redundant variable."
This reverts commit 0de7a6d1a2.

Change-Id: I327679b76a14cf9c3aec4b00b013b921408c32f9
2014-03-27 09:43:45 +00:00
Jean Chalard
26baa759d8 Revert "[CB16] Remove unused stuff"
This reverts commit 05c46f59fd.

Change-Id: Ica0feea10fff1b2a9ef42bc55cb7c1892b3a3f58
2014-03-27 09:43:21 +00:00
Jean Chalard
b3041a8210 am 5154c47c: Merge "[CB16] Remove unused stuff"
* commit '5154c47cbe57b51e3dac97a98d932ce6d5110d26':
  [CB16] Remove unused stuff
2014-03-27 08:55:34 +00:00
Keisuke Kuroyanagi
a83b013eec Remove DicNodeUtils::appendTwoWords().
Change-Id: I7402793b3f71ef5d786abea2f97bd4b624e4405f
2014-03-27 17:54:14 +09:00
Jean Chalard
5154c47cbe Merge "[CB16] Remove unused stuff" 2014-03-27 08:52:11 +00:00
Jean Chalard
6bd3723e73 [IL128] Remove passing some handlers.
Bug: 8636060
Change-Id: I088be9a7555265ca097667523defd73be4cbe37f
2014-03-27 17:51:32 +09:00
Keisuke Kuroyanagi
c17311cefe Remove unused method.
Change-Id: Iefb75136080e73c357511df045816f18cec767a6
2014-03-27 17:46:38 +09:00
Keisuke Kuroyanagi
a785fa8edd Dictionary migration in Java side.
Bug: 13406708

Change-Id: If83938e4b4810d2e8353c70cdd8ef3ea97a29571
2014-03-27 17:46:35 +09:00
Ken Wakasa
54d7389a43 am e04a9798: Merge "Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too."
* commit 'e04a9798f6f1e2c4976c8c8bf07a204fa76a6da9':
  Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too.
2014-03-27 08:41:28 +00:00
Keisuke Kuroyanagi
65e88e14ee am b4a983d4: Merge "Remove DicNode.isFirstWord()."
* commit 'b4a983d400fdb6e86694a594361895aef3e9c497':
  Remove DicNode.isFirstWord().
2014-03-27 08:41:26 +00:00
Jean Chalard
e769c13af4 am 5feda45a: Merge "[CB15] Remove a redundant variable."
* commit '5feda45a6fd89e95b07b0ff1cc9dcaf7de029da1':
  [CB15] Remove a redundant variable.
2014-03-27 08:41:25 +00:00
Ken Wakasa
e04a9798f6 Merge "Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too." 2014-03-27 08:27:59 +00:00
Ken Wakasa
e289441f92 Call setLayerType(LAYER_TYPE_HARDWARE) for EmojiPalettesView too.
This CL probably does not addresses the bug, but still this should
be the right thing to do here.

bug: 12667742
Change-Id: I587652942fd66094779fb7942c734e0ff5f9d0b6
2014-03-27 17:26:22 +09:00
Keisuke Kuroyanagi
b4a983d400 Merge "Remove DicNode.isFirstWord()." 2014-03-27 08:17:05 +00:00
Jean Chalard
5feda45a6f Merge "[CB15] Remove a redundant variable." 2014-03-27 08:05:23 +00:00
Jean Chalard
05c46f59fd [CB16] Remove unused stuff
Bug: 13406701
Change-Id: Ib863c5181e1f5d74cfa4458060afc49d1ee8109e
2014-03-27 16:47:30 +09:00
Jean Chalard
0de7a6d1a2 [CB15] Remove a redundant variable.
This is a tiny bit slower, but probably unnoticeable.
Still, it gains some performance in other places,
saves memory, and more importantly makes for simpler
code, so it's certainly better.

Change-Id: Id1ab4f73f71acd73f5920bc729817abd22cf0d07
2014-03-27 16:47:27 +09:00
Keisuke Kuroyanagi
83ef574f56 am 6008898b: Merge "Move code only used for dicttool and tests under tests."
* commit '6008898b99a14ecdf87f90311c47799e2159d1c8':
  Move code only used for dicttool and tests under tests.
2014-03-27 06:40:43 +00:00
Keisuke Kuroyanagi
6008898b99 Merge "Move code only used for dicttool and tests under tests." 2014-03-27 06:37:10 +00:00
Keisuke Kuroyanagi
93cda5bb39 Move code only used for dicttool and tests under tests.
Bug: 13035567
Change-Id: I13c6df013ef2b67c9bf67455d9c32d283bf9ea2e
2014-03-27 15:30:32 +09:00
Keisuke Kuroyanagi
79fccd5432 am 3c38e1f2: Merge "Fix: NPE in isValidWord after dictionaries are closed."
* commit '3c38e1f269ad34a663db672e5cfb291fb1931987':
  Fix: NPE in isValidWord after dictionaries are closed.
2014-03-27 03:16:40 +00:00
Keisuke Kuroyanagi
3c38e1f269 Merge "Fix: NPE in isValidWord after dictionaries are closed." 2014-03-27 03:12:07 +00:00
Keisuke Kuroyanagi
7b516d496d Fix: NPE in isValidWord after dictionaries are closed.
Bug: 13650542
Change-Id: I1bdc838fca48d6ef12db5e70d40273d1236128d1
2014-03-27 12:03:58 +09:00
Tadashi G. Takaoka
f60c43d34a am 94f111f8: Remove "sRGB IEC61966-2.1" profile to supress libpng warning
* commit '94f111f88176063aad45622a914a662a9e992c2f':
  Remove "sRGB IEC61966-2.1" profile to supress libpng warning
2014-03-27 02:53:46 +00:00
Tadashi G. Takaoka
94f111f881 Remove "sRGB IEC61966-2.1" profile to supress libpng warning
The above ICC profile causes the following libpng warnings while APK
packaging.

* libpng warning: iCCP: known incorrect sRGB profile
* libpng warning: iCCP: profile 'icc': 'RGB ': RGB color space not
  permitted on grayscale PNG

Bug: 11869853
Change-Id: Ida296d9e3bbd2abaae7c7500d77c8dc54d8b2382
2014-03-27 11:37:52 +09:00
Ken Wakasa
582f30bdae am a8cd7647: Merge "RegisterNatives() returns 0 on success."
* commit 'a8cd7647fe99e39a828f476d6685000c2afedb05':
  RegisterNatives() returns 0 on success.
2014-03-27 02:26:57 +00:00
Ken Wakasa
a8cd7647fe Merge "RegisterNatives() returns 0 on success." 2014-03-27 02:20:58 +00:00
Tadashi G. Takaoka
ba5720b927 am 4cb15268: Fix crash while entering emoticons
* commit '4cb152682d1ebb09b7a5356e81b78b7fed11de69':
  Fix crash while entering emoticons
2014-03-27 02:15:52 +00:00
Tadashi G. Takaoka
4cb152682d Fix crash while entering emoticons
Bug: 13652919
Change-Id: Idd66240ac882fa890cfb28a477403ee09dc716ce
2014-03-27 11:08:11 +09:00
Baligh Uddin
a0ea344cc7 Import translations. DO NOT MERGE
Change-Id: Ia5b2ec8549346f3b4b1c2ffd569abde6cdecae3e
Auto-generated-cl: translation import
2014-03-26 17:32:17 -07:00
Baligh Uddin
d357d960a0 Import translations. DO NOT MERGE
Change-Id: I3edab05b4043bb083b1b5286b3b08d4d23e272ad
Auto-generated-cl: translation import
2014-03-26 17:31:04 -07:00
The Android Automerger
b40db6499b merge in master-release history after reset to master 2014-03-26 05:50:51 -07:00
Ken Wakasa
63b48311b0 RegisterNatives() returns 0 on success.
cf. http://docs.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html#wp5833

Change-Id: I2c599f2d8765a7475c7076e6b049f77ad79feb79
2014-03-26 20:47:14 +09:00
Tadashi G. Takaoka
70f8f4453e am 317075e0: Merge "Suppress warnings related to string resource"
* commit '317075e00dc3e2eaa097604e7b1dc36ee1c61299':
  Suppress warnings related to string resource
2014-03-26 03:15:58 -07:00
Tadashi G. Takaoka
317075e00d Merge "Suppress warnings related to string resource" 2014-03-26 10:12:52 +00:00
Tadashi G. Takaoka
65ed97a31d am c4b558d3: Merge "Rename text resources consistently"
* commit 'c4b558d375c6db58bb976b8d089aa157e54534b8':
  Rename text resources consistently
2014-03-26 03:10:21 -07:00
Tadashi G. Takaoka
c4b558d375 Merge "Rename text resources consistently" 2014-03-26 10:06:34 +00:00