a229886ef2
am 923a6a31: Merge "Revert "Change the definition of NOT_A_CHARACTER"" into jb-mr1-dev
...
* commit '923a6a31ae84b8084dccf905abb3fc93b9e45a6f':
Revert "Change the definition of NOT_A_CHARACTER"
2012-08-27 00:59:58 -07:00
923a6a31ae
Merge "Revert "Change the definition of NOT_A_CHARACTER"" into jb-mr1-dev
2012-08-27 00:58:25 -07:00
fba0019ee2
Revert "Change the definition of NOT_A_CHARACTER"
...
This reverts commit a31d180cc3
2012-08-27 00:53:48 -07:00
a4862f3cf5
am fe49ca61: am 1451a0fb: Merge "Optimize gesture preview trail drawing a bit" into jb-mr1-dev
...
* commit 'fe49ca61f949aedc4492c42f213ae650df8ae938':
Optimize gesture preview trail drawing a bit
2012-08-27 00:33:52 -07:00
fe49ca61f9
am 1451a0fb: Merge "Optimize gesture preview trail drawing a bit" into jb-mr1-dev
...
* commit '1451a0fb1fbe7b86fe12742a28c759d5cbade5dd':
Optimize gesture preview trail drawing a bit
2012-08-27 00:31:31 -07:00
37b153e205
Step 40-A Cleanup touch path
...
Change-Id: Id22c5ae6afbf040227dc47153b0849bbe38ff66f
2012-08-27 16:30:59 +09:00
1451a0fb1f
Merge "Optimize gesture preview trail drawing a bit" into jb-mr1-dev
2012-08-27 00:29:48 -07:00
1c2f332239
Optimize gesture preview trail drawing a bit
...
This change also change the fading out duration of the gesture
preview trail to 800msec from 1,000msec
Change-Id: Icfd5b1ecad66db4f978249486f5fe362a3ae9640
2012-08-27 14:43:39 +09:00
ca5d58da4f
am 84809905: am 76951d8e: Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
...
* commit '8480990577b48b742ee67a94d30855c68975c59d':
Change the definition of NOT_A_CHARACTER
2012-08-26 20:36:56 -07:00
8480990577
am 76951d8e: Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
...
* commit '76951d8e5a573233aba855a0fa5ba501217a3371':
Change the definition of NOT_A_CHARACTER
2012-08-26 20:35:03 -07:00
76951d8e5a
Merge "Change the definition of NOT_A_CHARACTER" into jb-mr1-dev
2012-08-26 20:32:28 -07:00
a31d180cc3
Change the definition of NOT_A_CHARACTER
...
Change-Id: I519b1e5478abefb1c18cb6e3ab2862be045583de
2012-08-27 12:27:53 +09:00
0bd83093bb
am b487f1d1: am 297f2391: Try using hash_map
...
* commit 'b487f1d1d8b6db89803ce860bc48753f54594b7c':
Try using hash_map
2012-08-26 20:04:42 -07:00
b487f1d1d8
am 297f2391: Try using hash_map
...
* commit '297f239196d78cf3bd8aca8adb86331a3f8d2139':
Try using hash_map
2012-08-26 20:03:01 -07:00
297f239196
Try using hash_map
...
Change-Id: Icac47d03e1355e83b4dd3b0e3d7739f1dd5a3b98
2012-08-26 18:39:15 +09:00
74e193719a
am 0ca4d191: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '0ca4d19117fc79026acc42115f21f4c02df9d902':
2012-08-25 07:21:33 -07:00
0ca4d19117
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I106a8572e01093f4593978e2967b5f65bb2598c5
2012-08-25 07:17:38 -07:00
57fc681d51
am 5f435724: am 43da9ce0: Add mako keypress vibration and volume settings
...
* commit '5f4357248f80837198733a717ceb1f0e56f2db90':
Add mako keypress vibration and volume settings
2012-08-24 18:43:14 -07:00
5f4357248f
am 43da9ce0: Add mako keypress vibration and volume settings
...
* commit '43da9ce041f1b622b23ec88a5606a162a99de0af':
Add mako keypress vibration and volume settings
2012-08-24 18:40:56 -07:00
43da9ce041
Add mako keypress vibration and volume settings
...
This prevents -1 and -1000 from appearing as the defaults in
Advanced Settings.
Change-Id: I42938782077a0a3dfb5ec2125c0266b6712bcf63
2012-08-24 18:08:05 -07:00
b3f517b0aa
am 4f3842fa: am 642ad495: am 5f677699: (-s ours) am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member"
...
* commit '4f3842faabc8fc85e62f29dd88f3ef0f950f84a1':
Fixed inline initialization of non-integral static const member
2012-08-24 14:19:11 -07:00
ce5dd6f179
am 4c3c1dbe: am edda38a3: am 96061a70: (-s ours) am d78b9f7d: Merge "Fixing unused private field error"
...
* commit '4c3c1dbe247af9593b69b14f73e8f42ce039b637':
Fixing unused private field error
2012-08-24 14:19:10 -07:00
4f3842faab
am 642ad495: am 5f677699: (-s ours) am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member"
...
* commit '642ad495e29a6d4e64211be1a09ad9a18df4af3a':
Fixed inline initialization of non-integral static const member
2012-08-24 12:58:32 -07:00
642ad495e2
am 5f677699: (-s ours) am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member"
...
* commit '5f67769903dfb3e459ea8d42e50289ec300fe983':
Fixed inline initialization of non-integral static const member
2012-08-24 12:55:59 -07:00
5f67769903
am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member"
...
* commit 'dbe3ac45009366e7745492b135a5ce6967786fc4':
Fixed inline initialization of non-integral static const member
2012-08-24 12:50:01 -07:00
4c3c1dbe24
am edda38a3: am 96061a70: (-s ours) am d78b9f7d: Merge "Fixing unused private field error"
...
* commit 'edda38a3db6a2c84af47d4888a94d24a054e2b88':
Fixing unused private field error
2012-08-24 12:46:49 -07:00
edda38a3db
am 96061a70: (-s ours) am d78b9f7d: Merge "Fixing unused private field error"
...
* commit '96061a701db72a031aa899a71b1730ce598e9a28':
Fixing unused private field error
2012-08-24 12:45:00 -07:00
dbe3ac4500
Merge "Fixed inline initialization of non-integral static const member"
2012-08-24 12:44:32 -07:00
96061a701d
am d78b9f7d: Merge "Fixing unused private field error"
...
* commit 'd78b9f7d81a3730671b91f247e1be3bb1f2ba202':
Fixing unused private field error
2012-08-24 12:35:14 -07:00
d78b9f7d81
Merge "Fixing unused private field error"
2012-08-24 12:28:18 -07:00
cddddc248b
am af197b3e: am 0d63e6ea: Fix initialize order.
...
* commit 'af197b3e7ba2fda908816863bb9e06bc38af6319':
Fix initialize order.
2012-08-24 08:14:33 -07:00
af197b3e7b
am 0d63e6ea: Fix initialize order.
...
* commit '0d63e6ea84a695f4b4af554aeedff1914a659209':
Fix initialize order.
2012-08-24 08:11:50 -07:00
0d63e6ea84
Fix initialize order.
...
Change-Id: I2686540bc6ed858e6d7ddc05a962c93714b94e1d
2012-08-25 00:03:16 +09:00
d72b83a8ac
am c4d92502: am 162c211b: Address warnings by -Weffc++
...
* commit 'c4d92502027ecfc07a730f273adfda7267f49759':
Address warnings by -Weffc++
2012-08-24 08:01:56 -07:00
c4d9250202
am 162c211b: Address warnings by -Weffc++
...
* commit '162c211b44c1546b2e9be36e0cec50de497217a9':
Address warnings by -Weffc++
2012-08-24 07:59:19 -07:00
162c211b44
Address warnings by -Weffc++
...
Change-Id: Icd60f1ed2ace0b975d8785bc8a386c7944846075
2012-08-24 23:50:39 +09:00
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
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
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
0a4692efa8
Merge "Step 39-A Cleanup proximity_info_state" into jb-mr1-dev
2012-08-24 01:56:01 -07:00
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
08f00cf55f
Step 39-A Cleanup proximity_info_state
...
Change-Id: I6070929f310f7dc6359d12d62e81d2e2e032c38e
2012-08-24 17:52:36 +09:00
5e3b93542d
Fix the bug that the first gesture preview trail isn't drawn
...
Change-Id: Ib3acd7c0b401e6d95b39552b48d0d974793eb438
2012-08-24 17:48:23 +09:00
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
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
a1a669a121
Merge "Add multiple gesture preview trails animation" into jb-mr1-dev
2012-08-24 01:05:21 -07:00
333a300586
Add multiple gesture preview trails animation
...
Change-Id: I533e6de9b138317472565be82c8ba5e422472888
2012-08-24 17:04:20 +09:00
851956a616
am 38bfa2f8: am 48f0460d: Merge "Refactor" into jb-mr1-dev
...
* commit '38bfa2f8685bc25ea39e881d322ae9f96e005847':
Refactor
2012-08-24 00:37:54 -07:00
38bfa2f868
am 48f0460d: Merge "Refactor" into jb-mr1-dev
...
* commit '48f0460d4c91d83209d226cb12d81a1174eaa438':
Refactor
2012-08-24 00:34:54 -07:00
48f0460d4c
Merge "Refactor" into jb-mr1-dev
2012-08-23 22:59:13 -07:00
Satoshi Kataoka
Tadashi G. Takaoka
Ken Wakasa
The Android Open Source Project
Brian Muramatsu
Jean-Baptiste Queru