bf669e4379
am c93ac9db: am ffa88f0e: Merge "Move inflating mini keyboard code into separate method" into gingerbread
...
Merge commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22'
* commit 'c93ac9db7129f935425f79d5a460e7b926cb4a22':
Move inflating mini keyboard code into separate method
2010-09-03 02:59:42 -07:00
c93ac9db71
am ffa88f0e: Merge "Move inflating mini keyboard code into separate method" into gingerbread
...
Merge commit 'ffa88f0ef546d6393ecf4cec1ccb68229124f208' into gingerbread-plus-aosp
* commit 'ffa88f0ef546d6393ecf4cec1ccb68229124f208':
Move inflating mini keyboard code into separate method
2010-09-03 02:56:42 -07:00
ffa88f0ef5
Merge "Move inflating mini keyboard code into separate method" into gingerbread
2010-09-03 02:54:44 -07:00
6a36764a8d
am e5ae8c62: am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
...
Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742'
* commit 'e5ae8c62c83ad29d623562a74355bc619c216742':
Add a showing input method picker option by longpressing setting key
2010-09-03 01:55:37 -07:00
e5ae8c62c8
am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
...
Merge commit '1b09ac4f93a0138a414094c374fa2ff12e39c71a' into gingerbread-plus-aosp
* commit '1b09ac4f93a0138a414094c374fa2ff12e39c71a':
Add a showing input method picker option by longpressing setting key
2010-09-03 01:54:13 -07:00
1b09ac4f93
Merge "Add a showing input method picker option by longpressing setting key" into gingerbread
2010-09-03 01:51:38 -07:00
9a6a4d3d5f
Add a showing input method picker option by longpressing setting key
...
Bug: 2959271
Change-Id: I4b7e9a2de3cbe17b168ed8d0541a9b1cd9a9e107
2010-09-03 17:48:44 +09:00
0b4734396f
Move inflating mini keyboard code into separate method
...
Change-Id: Iba8e43ba6125e559d4c7d9cadb6bcb13b8eefc83
2010-09-03 17:35:54 +09:00
80e518d36b
am 1274cd16: am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbread
...
Merge commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544'
* commit '1274cd160f81d7a59828e0dbe66d87dfbe87c544':
Followup TBR in I87060049
2010-09-03 00:41:48 -07:00
1274cd160f
am 5583cb0a: Merge "Followup TBR in I87060049" into gingerbread
...
Merge commit '5583cb0afcb2104a10689a1c60c051a99e98678b' into gingerbread-plus-aosp
* commit '5583cb0afcb2104a10689a1c60c051a99e98678b':
Followup TBR in I87060049
2010-09-03 00:40:20 -07:00
5583cb0afc
Merge "Followup TBR in I87060049" into gingerbread
2010-09-03 00:37:59 -07:00
0529a04b6a
Followup TBR in I87060049
...
This change is followup TBR in I87060049cad6f9d6432b6c4a246c15587ae0d837
Change-Id: I02ee33da269162f5e95ce5b985dbf5094ba14c0d
2010-09-03 15:55:18 +09:00
133bad6b85
am 025bafb5: am 6f8ff3b9: Merge "Update delete key" into gingerbread
...
Merge commit '025bafb5d4272323491eb90a845ead44de4d80b7'
* commit '025bafb5d4272323491eb90a845ead44de4d80b7':
Update delete key
2010-09-02 23:34:16 -07:00
025bafb5d4
am 6f8ff3b9: Merge "Update delete key" into gingerbread
...
Merge commit '6f8ff3b971b5ac17e0912e5cdae1ddf2e2afa242' into gingerbread-plus-aosp
* commit '6f8ff3b971b5ac17e0912e5cdae1ddf2e2afa242':
Update delete key
2010-09-02 23:32:42 -07:00
6f8ff3b971
Merge "Update delete key" into gingerbread
2010-09-02 23:30:40 -07:00
ec8c4f0d37
am 66546535: am c5841994: Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
...
Merge commit '6654653562d0ec5d46a74f8c49eab2488e273cf2'
* commit '6654653562d0ec5d46a74f8c49eab2488e273cf2':
Change symbol on space bar when autocompletion is activated
2010-09-02 23:30:24 -07:00
6654653562
am c5841994: Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
...
Merge commit 'c5841994affbca41a7070a769f4f8e51bee4773b' into gingerbread-plus-aosp
* commit 'c5841994affbca41a7070a769f4f8e51bee4773b':
Change symbol on space bar when autocompletion is activated
2010-09-02 23:27:49 -07:00
cf41bd392f
Update delete key
...
Change-Id: I0348e4846131f9913b4ab6c2c2a9427a9a53c74e
2010-09-03 15:27:07 +09:00
c5841994af
Merge "Change symbol on space bar when autocompletion is activated" into gingerbread
2010-09-02 23:26:06 -07:00
41feaaadb7
Change symbol on space bar when autocompletion is activated
...
bug: 2959279
Change-Id: Icc70b7cce0c245ae2451d324debd346f226b8769
2010-09-03 15:17:26 +09:00
7d4833a8bf
am 22776af8: am c5d33b16: Fix NPE in LatinKeyboardBaseView
...
Merge commit '22776af828c69db22d90b42d196f487095905c70'
* commit '22776af828c69db22d90b42d196f487095905c70':
Fix NPE in LatinKeyboardBaseView
2010-09-02 22:23:09 -07:00
22776af828
am c5d33b16: Fix NPE in LatinKeyboardBaseView
...
Merge commit 'c5d33b16521de56ad01b0b6308217efb009078b7' into gingerbread-plus-aosp
* commit 'c5d33b16521de56ad01b0b6308217efb009078b7':
Fix NPE in LatinKeyboardBaseView
2010-09-02 22:20:27 -07:00
c5d33b1652
Fix NPE in LatinKeyboardBaseView
...
This change also refactors some mini-keyboard related methods in
LatinKeyboardBaseView and PointerTracker class.
Bug: 2973236
Change-Id: I3190fe89ea3ac3c6d351ed4b6d77de98a0aa65db
2010-09-03 13:03:08 +09:00
efabc4eb52
am 2fb112f1: am 7083b748: Propagate preview enable attribute to mini-keyboard
...
Merge commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7'
* commit '2fb112f142bdac2c7cb96da5f264b5575ce611e7':
Propagate preview enable attribute to mini-keyboard
2010-09-02 13:35:17 -07:00
2fb112f142
am 7083b748: Propagate preview enable attribute to mini-keyboard
...
Merge commit '7083b7486ec62ab06818e1bfbd0694d5f3563473' into gingerbread-plus-aosp
* commit '7083b7486ec62ab06818e1bfbd0694d5f3563473':
Propagate preview enable attribute to mini-keyboard
2010-09-02 13:32:39 -07:00
7083b7486e
Propagate preview enable attribute to mini-keyboard
...
Bug: 2959169
Change-Id: Iea1bec44baf3344d9f91280bd2b8f28476cbcf51
2010-09-03 05:28:43 +09:00
539fb1bc67
am 20052f34: am fe72f135: Remove close button from mini keyboard
...
Merge commit '20052f34f987ab946d54cc405fa42cd0510fb94f'
* commit '20052f34f987ab946d54cc405fa42cd0510fb94f':
Remove close button from mini keyboard
2010-09-02 13:15:20 -07:00
20052f34f9
am fe72f135: Remove close button from mini keyboard
...
Merge commit 'fe72f135b855cbbebe2c1a00650a58736370693c' into gingerbread-plus-aosp
* commit 'fe72f135b855cbbebe2c1a00650a58736370693c':
Remove close button from mini keyboard
2010-09-02 13:04:47 -07:00
e46f44714d
am cea6a25b: am 07221a4a: Support sliding pop-up mini-keyboard input
...
Merge commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4'
* commit 'cea6a25b904f536aff4efbf9eeb865bef8a3a4b4':
Support sliding pop-up mini-keyboard input
2010-09-02 13:01:25 -07:00
cea6a25b90
am 07221a4a: Support sliding pop-up mini-keyboard input
...
Merge commit '07221a4ad11fa5ae6275c107f1f86260691bd505' into gingerbread-plus-aosp
* commit '07221a4ad11fa5ae6275c107f1f86260691bd505':
Support sliding pop-up mini-keyboard input
2010-09-02 12:57:40 -07:00
fe72f135b8
Remove close button from mini keyboard
...
Bug: 2959169
Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393
2010-09-03 04:56:12 +09:00
6c8109dc15
am a723409a: am f0fd5065: Merge "Add a number alternation to English popup mini keyboard" into gingerbread
...
Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00'
* commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00':
Add a number alternation to English popup mini keyboard
2010-09-02 12:56:00 -07:00
a18e956f7a
am 23eb4711: am 6bfb234f: Refactor KeyDetector to share more methods
...
Merge commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe'
* commit '23eb4711020f73ebb89a761a0c4ab917a94cfabe':
Refactor KeyDetector to share more methods
2010-09-02 12:54:02 -07:00
a723409acf
am f0fd5065: Merge "Add a number alternation to English popup mini keyboard" into gingerbread
...
Merge commit 'f0fd506520052dbced70872663f9d61b1ab957d1' into gingerbread-plus-aosp
* commit 'f0fd506520052dbced70872663f9d61b1ab957d1':
Add a number alternation to English popup mini keyboard
2010-09-02 12:53:17 -07:00
07221a4ad1
Support sliding pop-up mini-keyboard input
...
TODO:
- Remove close button on mini-keyboard
- Dismiss mini-keyboard when finger leave the screen while no key is selected
This change also renames some instance variables to have more meaningful name.
Bug: 2959169
Change-Id: I9fd79116a647d7be82415c6e9e7cdaf6edcb2bf6
2010-09-03 04:51:37 +09:00
23eb471102
am 6bfb234f: Refactor KeyDetector to share more methods
...
Merge commit '6bfb234f294b6ad95176f987256c85e8607d23f5' into gingerbread-plus-aosp
* commit '6bfb234f294b6ad95176f987256c85e8607d23f5':
Refactor KeyDetector to share more methods
2010-09-02 12:51:02 -07:00
f0fd506520
Merge "Add a number alternation to English popup mini keyboard" into gingerbread
2010-09-02 12:50:52 -07:00
6bfb234f29
Refactor KeyDetector to share more methods
...
Bug: 2959169
Change-Id: I87060049cad6f9d6432b6c4a246c15587ae0d837
2010-09-03 00:46:19 +09:00
ac64a5c3ed
am b52edca1: am 83b3cf56: Merge "Corresponding to TBR of Id2b0b974" into gingerbread
...
Merge commit 'b52edca15df778372e52986bc4f379d1b625a14a'
* commit 'b52edca15df778372e52986bc4f379d1b625a14a':
Corresponding to TBR of Id2b0b974
2010-09-02 07:26:55 -07:00
b52edca15d
am 83b3cf56: Merge "Corresponding to TBR of Id2b0b974" into gingerbread
...
Merge commit '83b3cf56cdb64f91ec32869bce237e16a1487f4a' into gingerbread-plus-aosp
* commit '83b3cf56cdb64f91ec32869bce237e16a1487f4a':
Corresponding to TBR of Id2b0b974
2010-09-02 07:24:58 -07:00
83b3cf56cd
Merge "Corresponding to TBR of Id2b0b974" into gingerbread
2010-09-02 07:22:50 -07:00
2fb7e2ff4d
am c98e7cb2: am 0fe4c9e1: Corresponding to TBR of Ie6cf6768
...
Merge commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc'
* commit 'c98e7cb28b4e05883531266c31ea4c09fca74edc':
Corresponding to TBR of Ie6cf6768
2010-09-02 06:44:13 -07:00
c98e7cb28b
am 0fe4c9e1: Corresponding to TBR of Ie6cf6768
...
Merge commit '0fe4c9e1a78445a27b74ae24afb292a84a893703' into gingerbread-plus-aosp
* commit '0fe4c9e1a78445a27b74ae24afb292a84a893703':
Corresponding to TBR of Ie6cf6768
2010-09-02 06:42:10 -07:00
72d98fab21
Corresponding to TBR of Id2b0b974
...
This is follow up change of Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
Bug: 2959169
Change-Id: Ie47db5fce7937a4d70c432ab76510d0dc3f68401
2010-09-02 22:36:22 +09:00
0fe4c9e1a7
Corresponding to TBR of Ie6cf6768
...
This is follow up change of Ie6cf67681180467bd8ba35d0205ce6727b7684a2
Bug: 2959169
Change-Id: I9e4cb0c9178856ddd6049f0b751b54f3ad26a266
2010-09-02 22:34:15 +09:00
e9eda7ea94
am 7f67c211: am 400046d6: Encapsulate vertical and horizontal correction values into KeyDetector.
...
Merge commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3'
* commit '7f67c211e7ec4bdf148c9dd468cc8e73ffeb66e3':
Encapsulate vertical and horizontal correction values into KeyDetector.
2010-09-02 06:02:53 -07:00
7f67c211e7
am 400046d6: Encapsulate vertical and horizontal correction values into KeyDetector.
...
Merge commit '400046d62e22899e28efd2a62321c637c7831f81' into gingerbread-plus-aosp
* commit '400046d62e22899e28efd2a62321c637c7831f81':
Encapsulate vertical and horizontal correction values into KeyDetector.
2010-09-02 06:01:00 -07:00
400046d62e
Encapsulate vertical and horizontal correction values into KeyDetector.
...
Bug: 2959169
Change-Id: Id2b0b974fffdf6f09ee1828e957b973d2ce1c315
2010-09-02 21:54:26 +09:00
3b4ecdeb05
Add a number alternation to English popup mini keyboard
...
This change is only for English locale. For other locales we should
need specification because keyboard layout and alternations are
different by locale.
Bug: 2959169
Change-Id: Ib63f53ce6c30d75eff78777aa0049b05d58ce55f
2010-09-02 21:06:30 +09:00
9b5867e3e6
am a4397ce3: am 6b4d521f: Merge "Add PointerTracker argument to long press related methods" into gingerbread
...
Merge commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4'
* commit 'a4397ce38af2e1ac3a8284bc078bd1e9cb4fecf4':
Add PointerTracker argument to long press related methods
2010-09-02 04:35:57 -07:00
Tadashi G. Takaoka
satok