Commit graph

33212 commits

Author SHA1 Message Date
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
Ken Wakasa
694114feca Remove redundant LOCAL_IS_HOST_MODULE assignments
Also, remove irrelevant LOCAL_NDK_STL_VARIANT for host modules.

Change-Id: I45e916c11f7c1f9b13956f01274a82ee7de1f558
2014-04-04 22:32:45 +09:00
Ken Wakasa
9268c09163 am 73fe4952: Merge "32-bit dicttool"
* commit '73fe49523b70b0cf649fa7fc0f096f91431f44f0':
  32-bit dicttool
2014-04-04 12:37:18 +00:00
Ken Wakasa
73fe49523b Merge "32-bit dicttool" 2014-04-04 12:33:23 +00:00
Keisuke Kuroyanagi
4d13f7f386 am f3d9e036: Merge "Separate NormalDistribution from ProximityInfoUtils."
* commit 'f3d9e0367ee22d5b205633785ad76e075011282c':
  Separate NormalDistribution from ProximityInfoUtils.
2014-04-04 11:23:11 +00:00
Keisuke Kuroyanagi
f3d9e0367e Merge "Separate NormalDistribution from ProximityInfoUtils." 2014-04-04 11:18:27 +00:00
Ken Wakasa
3ccbf7ef08 32-bit dicttool
As we can't easily turn on -m64 for only one module, the JNI library for
a host tool should be 32-bit, at least for now.

Change-Id: I1f001ccca1ad968a2241c0494bb70391fb11a59f
2014-04-04 20:10:04 +09:00
Jean Chalard
9228d50ee9 am 76c930ee: Merge "[CB22] Merge add and delete"
* commit '76c930eede66257d1b07e546ac12069ef206726a':
  [CB22] Merge add and delete
2014-04-04 10:16:05 +00:00
Jean Chalard
76c930eede Merge "[CB22] Merge add and delete" 2014-04-04 10:10:55 +00:00
Keisuke Kuroyanagi
3bf9647a26 Separate NormalDistribution from ProximityInfoUtils.
Bug: 13773693
Change-Id: I9e835cc92e16f8ae0e0492af0715d0ef5cd84a35
2014-04-04 18:49:12 +09:00
Tadashi G. Takaoka
952aebc52d am fd6b1ac8: Remove ProGuard warning
* commit 'fd6b1ac82273f51bc1ab27cc054ae6bf0ee8a4bd':
  Remove ProGuard warning
2014-04-04 09:33:37 +00:00
Tadashi G. Takaoka
fd6b1ac822 Remove ProGuard warning
Bug: 13662059
Change-Id: Ic90a882e82332b323bcd3617e5bc465f919bd921
2014-04-04 17:59:26 +09:00
Tadashi G. Takaoka
4767c226ef am 9b46ddc1: Use platform default theme for activities and dialogs
* commit '9b46ddc1d51fac37f970e108f7d93eb9ea11e1be':
  Use platform default theme for activities and dialogs
2014-04-04 08:41:37 +00:00
Tadashi G. Takaoka
9b46ddc1d5 Use platform default theme for activities and dialogs
Bug: 13698528
Change-Id: Ib904c911452525e3749c0eb287434b504576db5f
2014-04-04 17:13:54 +09:00
Jean Chalard
3b8b2977a6 am f977ca6c: Merge "[CB21] More refactoring"
* commit 'f977ca6c927ef96393181708355ac874232df291':
  [CB21] More refactoring
2014-04-04 07:00:59 +00:00
Jean Chalard
f977ca6c92 Merge "[CB21] More refactoring" 2014-04-04 06:56:49 +00:00
Jean Chalard
e36667587d am 9298c9b1: Merge "Reset the client database on version upgrade."
* commit '9298c9b1e110f8ca67db443e586b829ea150d59f':
  Reset the client database on version upgrade.
2014-04-04 05:18:02 +00:00
Jean Chalard
9298c9b1e1 Merge "Reset the client database on version upgrade." 2014-04-04 05:12:02 +00:00
Jean Chalard
446fbaa020 am 4ac0904f: Merge "[CB20] Some more refactoring"
* commit '4ac0904f83e77530938883ccf1dcb5f4f22c6a54':
  [CB20] Some more refactoring
2014-04-04 05:08:15 +00:00
Jean Chalard
4ac0904f83 Merge "[CB20] Some more refactoring" 2014-04-04 05:03:45 +00:00
Tadashi G. Takaoka
529435352b am eb88f03f: Merge "Fix subtype count unit test due to Ic7c17d9656"
* commit 'eb88f03f97393592611842c1de3b32c723f30b23':
  Fix subtype count unit test due to Ic7c17d9656
2014-04-03 15:49:53 +00:00
Tadashi G. Takaoka
eb88f03f97 Merge "Fix subtype count unit test due to Ic7c17d9656" 2014-04-03 15:44:14 +00:00