Commit graph

9572 commits

Author SHA1 Message Date
Ken Wakasa
162c211b44 Address warnings by -Weffc++
Change-Id: Icd60f1ed2ace0b975d8785bc8a386c7944846075
2012-08-24 23:50:39 +09:00
Satoshi Kataoka
c2fa66ba40 am c7401068: am 0a4692ef: Merge "Step 39-A Cleanup proximity_info_state" into jb-mr1-dev
* commit 'c740106854e5d688d8238fb8464e4a3c4ce89567':
  Step 39-A Cleanup proximity_info_state
2012-08-24 02:00:40 -07:00
Satoshi Kataoka
c740106854 am 0a4692ef: Merge "Step 39-A Cleanup proximity_info_state" into jb-mr1-dev
* commit '0a4692efa8b98e9a1c9c958ced7f49a973f94ee1':
  Step 39-A Cleanup proximity_info_state
2012-08-24 01:57:41 -07:00
Tadashi G. Takaoka
4a048202cf am 8bbd74f2: am 5e3b9354: Fix the bug that the first gesture preview trail isn\'t drawn
* commit '8bbd74f20450a73ac3d00dcb4ea031ec4a58745e':
  Fix the bug that the first gesture preview trail isn't drawn
2012-08-24 01:56:08 -07:00
Satoshi Kataoka
0a4692efa8 Merge "Step 39-A Cleanup proximity_info_state" into jb-mr1-dev 2012-08-24 01:56:01 -07:00
Tadashi G. Takaoka
8bbd74f204 am 5e3b9354: Fix the bug that the first gesture preview trail isn\'t drawn
* commit '5e3b93542d2096b0537390996c04a23013e325a5':
  Fix the bug that the first gesture preview trail isn't drawn
2012-08-24 01:54:09 -07:00
Satoshi Kataoka
08f00cf55f Step 39-A Cleanup proximity_info_state
Change-Id: I6070929f310f7dc6359d12d62e81d2e2e032c38e
2012-08-24 17:52:36 +09:00
Tadashi G. Takaoka
5e3b93542d Fix the bug that the first gesture preview trail isn't drawn
Change-Id: Ib3acd7c0b401e6d95b39552b48d0d974793eb438
2012-08-24 17:48:23 +09:00
Tadashi G. Takaoka
4a1cbef339 am d6e390c7: am a1a669a1: Merge "Add multiple gesture preview trails animation" into jb-mr1-dev
* commit 'd6e390c765ee4f555164cfbbf1767fa3418427ff':
  Add multiple gesture preview trails animation
2012-08-24 01:09:49 -07:00
Tadashi G. Takaoka
d6e390c765 am a1a669a1: Merge "Add multiple gesture preview trails animation" into jb-mr1-dev
* commit 'a1a669a1212d630e9c04d9ddfc1588169359c790':
  Add multiple gesture preview trails animation
2012-08-24 01:07:50 -07:00
Tadashi G. Takaoka
a1a669a121 Merge "Add multiple gesture preview trails animation" into jb-mr1-dev 2012-08-24 01:05:21 -07:00
Tadashi G. Takaoka
333a300586 Add multiple gesture preview trails animation
Change-Id: I533e6de9b138317472565be82c8ba5e422472888
2012-08-24 17:04:20 +09:00
Satoshi Kataoka
851956a616 am 38bfa2f8: am 48f0460d: Merge "Refactor" into jb-mr1-dev
* commit '38bfa2f8685bc25ea39e881d322ae9f96e005847':
  Refactor
2012-08-24 00:37:54 -07:00
Satoshi Kataoka
38bfa2f868 am 48f0460d: Merge "Refactor" into jb-mr1-dev
* commit '48f0460d4c91d83209d226cb12d81a1174eaa438':
  Refactor
2012-08-24 00:34:54 -07:00
Satoshi Kataoka
48f0460d4c Merge "Refactor" into jb-mr1-dev 2012-08-23 22:59:13 -07:00
Satoshi Kataoka
233aad5e5c Refactor
Change-Id: I907126034d9cc821df8353a78f713638dfc322d6
2012-08-24 14:45:54 +09:00
Jean Chalard
19fb8f242a am 8c1005f2: am 5cc59616: Merge "Use ByteBuffer when reading FusionDictionary from file." into jb-mr1-dev
* commit '8c1005f2ec8855051afc04364a55c26ffc077ecc':
  Use ByteBuffer when reading FusionDictionary from file.
2012-08-23 22:00:48 -07:00
Jean Chalard
8c1005f2ec am 5cc59616: Merge "Use ByteBuffer when reading FusionDictionary from file." into jb-mr1-dev
* commit '5cc596160a7df3547d81487e1a556f5d47cd7d70':
  Use ByteBuffer when reading FusionDictionary from file.
2012-08-23 21:58:48 -07:00
Jean Chalard
5cc596160a Merge "Use ByteBuffer when reading FusionDictionary from file." into jb-mr1-dev 2012-08-23 21:56:02 -07:00
Yuichiro Hanada
d4fe7fda30 Use ByteBuffer when reading FusionDictionary from file.
Change-Id: Ia71561648e17f846d277c22309ac37c21c67a537
2012-08-24 13:31:08 +09:00
Satoshi Kataoka
8f504468e6 am dc8b73a8: am 687a2447: Step 38-A Cleanup touch path
* commit 'dc8b73a8d1fa6ab7fa5e3e57ca4ed34088ae9f7c':
  Step 38-A Cleanup touch path
2012-08-23 20:09:44 -07:00
Satoshi Kataoka
dc8b73a8d1 am 687a2447: Step 38-A Cleanup touch path
* commit '687a244703a02323ebd64433cbaead5def499861':
  Step 38-A Cleanup touch path
2012-08-23 20:07:51 -07:00
Ariel Bernal
dd70f8e8b1 Fixed inline initialization of non-integral static const member
Such initializations are a GNU extension not supported by clang.

Change-Id: I543c35cacdda080d2599cb99587661b2e9cd404f
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-23 15:26:32 -04:00
Ariel Bernal
be8a4cca2b Fixing unused private field error
Fixing error resulting from Wunused-private-field.

Change-Id: I2bbdefa707a55564eba9b77a88e229921787f357
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
2012-08-23 15:25:18 -04:00
The Android Automerger
138996443e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-23 06:34:22 -07:00
Satoshi Kataoka
687a244703 Step 38-A Cleanup touch path
Change-Id: I9bfac98b9ac10f3812290f21673c4002241eae01
2012-08-23 18:15:43 +09:00
Tadashi G. Takaoka
c8728cc7fc am 44fb3b81: am 64a26b43: Fix bug in InputPointers.append
* commit '44fb3b81a1c0b29ea4240976ba0e08630c8e7621':
  Fix bug in InputPointers.append
2012-08-23 02:04:20 -07:00
Tadashi G. Takaoka
44fb3b81a1 am 64a26b43: Fix bug in InputPointers.append
* commit '64a26b4389abb273afff7699a8c86596defd85bf':
  Fix bug in InputPointers.append
2012-08-23 02:02:21 -07:00
Tadashi G. Takaoka
64a26b4389 Fix bug in InputPointers.append
Change-Id: I39825757bbae32b66c4b61cb6c4fbcaa2e0c9c47
2012-08-23 17:59:08 +09:00
Tadashi G. Takaoka
c32f770798 am 5f1c59bb: am 64ee0961: Add toString method to InputPointers and ResizableIntArray
* commit '5f1c59bb2fb574bbfe717f2683accdc59c249c00':
  Add toString method to InputPointers and ResizableIntArray
2012-08-23 01:39:53 -07:00
Tadashi G. Takaoka
5f1c59bb2f am 64ee0961: Add toString method to InputPointers and ResizableIntArray
* commit '64ee09610024eb1436c51f9c9ef9fc3f77239d73':
  Add toString method to InputPointers and ResizableIntArray
2012-08-23 01:38:14 -07:00
Tadashi G. Takaoka
64ee096100 Add toString method to InputPointers and ResizableIntArray
Change-Id: I835ee131855bef8233cf2672e2fb288b939148a6
2012-08-23 17:29:36 +09:00
Tadashi G. Takaoka
83048b3aa4 am dc38a5d0: am 922a8573: Merge "Remeve the reference of MainKeyboardView from PointerTracker" into jb-mr1-dev
* commit 'dc38a5d092121284384d593ed0f21cf55c13daec':
  Remeve the reference of MainKeyboardView from PointerTracker
2012-08-23 00:30:18 -07:00
Tadashi G. Takaoka
dc38a5d092 am 922a8573: Merge "Remeve the reference of MainKeyboardView from PointerTracker" into jb-mr1-dev
* commit '922a85734d21c767647f55fd69a339dd77d44d67':
  Remeve the reference of MainKeyboardView from PointerTracker
2012-08-23 00:28:27 -07:00
Tadashi G. Takaoka
922a85734d Merge "Remeve the reference of MainKeyboardView from PointerTracker" into jb-mr1-dev 2012-08-23 00:26:30 -07:00
Tadashi G. Takaoka
5509798977 Remeve the reference of MainKeyboardView from PointerTracker
This change also consolidates MainKeyboardView.KeyTimerParams with
KeyTimerHandler.

Change-Id: Ifc70ca81fa7d7daded4c2204fcdffdf942c16bc5
2012-08-23 16:22:13 +09:00
Tadashi G. Takaoka
f80df0ebdf am 014148ae: am b28139f5: Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
* commit '014148aebda90bb29e813ac08215f3f2f9de3e03':
  Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
2012-08-23 00:21:36 -07:00
Tadashi G. Takaoka
014148aebd am b28139f5: Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
* commit 'b28139f51b2f2e6dfd60e968024006f53590a41c':
  Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
2012-08-23 00:19:48 -07:00
Tadashi G. Takaoka
b28139f51b Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
Change-Id: I089e905def0b70bd38fd54ab2d84689b904bb320
2012-08-23 15:54:00 +09:00
Tadashi G. Takaoka
d9768e006e am 308ceb89: am 694ccb5b: Cosmetic change to PointerTracker
* commit '308ceb89c76728890a34327181dc856d027906cc':
  Cosmetic change to PointerTracker
2012-08-22 23:30:08 -07:00
Tadashi G. Takaoka
308ceb89c7 am 694ccb5b: Cosmetic change to PointerTracker
* commit '694ccb5ba1bb61caea379487c6bdfae7c64c2643':
  Cosmetic change to PointerTracker
2012-08-22 23:28:12 -07:00
Tadashi G. Takaoka
694ccb5ba1 Cosmetic change to PointerTracker
* Add final to parameters and locals
* Add curly bracket around single statement if-block

Change-Id: I9f3b23f7145e6b1d6ef806d991ed71ebc63311ff
2012-08-23 15:14:46 +09:00
Kurt Partridge
62dbcff395 am 0f56f9ed: am b5ace11a: ResearchLogging upload via service
* commit '0f56f9ed01b6ca62f995e0b6ab855f460ebaf2e4':
  ResearchLogging upload via service
2012-08-22 17:32:50 -07:00
Kurt Partridge
0f56f9ed01 am b5ace11a: ResearchLogging upload via service
* commit 'b5ace11a2e7b88e6b89b6297d5d540f351e48a4a':
  ResearchLogging upload via service
2012-08-22 17:31:13 -07:00
Kurt Partridge
73c2c67789 am 0cf7aa5d: am fa0bac90: ResearchLogging log when preferences change
* commit '0cf7aa5dfd192ccdabb9e5488b4ed9bf046147a2':
  ResearchLogging log when preferences change
2012-08-22 16:00:21 -07:00
Kurt Partridge
0cf7aa5dfd am fa0bac90: ResearchLogging log when preferences change
* commit 'fa0bac9057e2dbb0b1aacc6d748a8bcf12ac1462':
  ResearchLogging log when preferences change
2012-08-22 15:59:04 -07:00
The Android Open Source Project
49bac97f7e am 0f84e5d2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '0f84e5d2ecd0df20387ffe877067f66eda7232eb':
2012-08-22 15:40:02 -07:00
The Android Open Source Project
0f84e5d2ec Reconcile with jb-mr1-release - do not merge
Change-Id: Ica5738e048a4cc24205e754276e2f4dc11102df6
2012-08-22 15:36:34 -07:00
Kurt Partridge
b5ace11a2e ResearchLogging upload via service
Upload using an intent service rather than just a thread.  More robust in case the keyboard
is closed and the upload hasn't finished yet.

multi-project commit with Id515c2b1b0d6f85be50f92a661a2d32ebaeaa143

Bug: 6188932
Change-Id: I64a9fab92ff89ee09df877db4e5f7f0ec0ffb3b6
2012-08-22 11:27:46 -07:00
Kurt Partridge
fa0bac9057 ResearchLogging log when preferences change
Bug: 6188932
Change-Id: I82a115aed30d7693f92d784a32b038996d8b71e3
2012-08-22 11:27:45 -07:00