Jean Chalard
d0f259aa91
am 5bf2f9f8: am 2035b946: Merge "Reinstate the shortcut-only attribute" into jb-mr1-dev
...
* commit '5bf2f9f8cfd58898609dd43911bd382485e5f12d':
Reinstate the shortcut-only attribute
2012-09-02 19:32:50 -07:00
Jean Chalard
5bf2f9f8cf
am 2035b946: Merge "Reinstate the shortcut-only attribute" into jb-mr1-dev
...
* commit '2035b946a38dd072119a9771252aef3667f08f68':
Reinstate the shortcut-only attribute
2012-09-02 19:30:35 -07:00
Jean Chalard
2035b946a3
Merge "Reinstate the shortcut-only attribute" into jb-mr1-dev
2012-09-02 19:28:01 -07:00
Jean-Baptiste Queru
fb7a5a6361
am 228b8347: am 27c093fc: am 70fb1d1a: am f0adce8a: Merge "Esperanto keyboard"
...
* commit '228b8347c714fc4ca25da1d637f80d4b40d82ccf':
Esperanto keyboard
2012-08-31 09:00:42 -07:00
Jean-Baptiste Queru
228b8347c7
am 27c093fc: am 70fb1d1a: am f0adce8a: Merge "Esperanto keyboard"
...
* commit '27c093fc5e6e0602e570d6bede4eb91a027fc2bb':
Esperanto keyboard
2012-08-31 07:11:07 -07:00
Jean-Baptiste Queru
27c093fc5e
am 70fb1d1a: am f0adce8a: Merge "Esperanto keyboard"
...
* commit '70fb1d1a690f3f16e4bbb19ffea349af1402cb1f':
Esperanto keyboard
2012-08-31 07:08:55 -07:00
Jean-Baptiste Queru
70fb1d1a69
am f0adce8a: Merge "Esperanto keyboard"
...
* commit 'f0adce8a491f1f1970354eef7e6fd078b237684c':
Esperanto keyboard
2012-08-31 07:04:00 -07:00
Jean-Baptiste Queru
f0adce8a49
Merge "Esperanto keyboard"
2012-08-31 06:31:05 -07:00
Jean Chalard
72b1c93941
Reinstate the shortcut-only attribute
...
Also add the blacklist attribute
Bug: 7005742
Bug: 2704000
Change-Id: Icbe60bdf25bfb098d9e3f20870be30d6aef07c9d
2012-08-31 22:11:52 +09:00
Tadashi G. Takaoka
423e5e370d
am b2f223e6: am a643b54b: Add missing KeyDrawParams default constructor to fix build
...
* commit 'b2f223e67d9962b7f37fc27dcbb82a15a06b7bc3':
Add missing KeyDrawParams default constructor to fix build
2012-08-31 05:12:58 -07:00
Tadashi G. Takaoka
6430d41a0a
am c92ac438: am aa546072: Merge "Support per-Key and per-Keyboard key visual attributes" into jb-mr1-dev
...
* commit 'c92ac4385044a794369a51c99e775d429ad3709a':
Support per-Key and per-Keyboard key visual attributes
2012-08-31 05:12:57 -07:00
Tadashi G. Takaoka
b2f223e67d
am a643b54b: Add missing KeyDrawParams default constructor to fix build
...
* commit 'a643b54b4daa262f7b6d5136c7ac54328bc09050':
Add missing KeyDrawParams default constructor to fix build
2012-08-31 05:00:33 -07:00
Tadashi G. Takaoka
c92ac43850
am aa546072: Merge "Support per-Key and per-Keyboard key visual attributes" into jb-mr1-dev
...
* commit 'aa54607246fa9494537ece89b3d2a180c7778383':
Support per-Key and per-Keyboard key visual attributes
2012-08-31 05:00:31 -07:00
Tadashi G. Takaoka
a643b54b4d
Add missing KeyDrawParams default constructor to fix build
...
Change-Id: Id2ae9e4085b4137c961b5202e0822d484dd71e8e
2012-08-31 20:28:46 +09:00
Tadashi G. Takaoka
aa54607246
Merge "Support per-Key and per-Keyboard key visual attributes" into jb-mr1-dev
2012-08-31 04:24:48 -07:00
Tadashi G. Takaoka
dc34da218a
Support per-Key and per-Keyboard key visual attributes
...
This change refactors KeyDrawParams and KeyPreviewDrawParams to
separate KeyVisualAttributes.
Change-Id: I4de549eef303e1debe4b8f84668e042445fc18da
2012-08-31 20:23:21 +09:00
Tadashi G. Takaoka
91f73a8c54
am 526066a9: am 67d0a597: Merge "Use resource to specify 5-rows keyboard parameters" into jb-mr1-dev
...
* commit '526066a99aa16d28fc94571a89dd8fe1fc365ba5':
Use resource to specify 5-rows keyboard parameters
2012-08-31 04:10:51 -07:00
Tadashi G. Takaoka
526066a99a
am 67d0a597: Merge "Use resource to specify 5-rows keyboard parameters" into jb-mr1-dev
...
* commit '67d0a597bc084c18750265decb6c26d30f5d9b91':
Use resource to specify 5-rows keyboard parameters
2012-08-31 04:09:03 -07:00
Tadashi G. Takaoka
67d0a597bc
Merge "Use resource to specify 5-rows keyboard parameters" into jb-mr1-dev
2012-08-31 04:06:35 -07:00
Tadashi G. Takaoka
3110c59a05
am c132476a: am 74b89db8: Merge "Fix key label padding" into jb-mr1-dev
...
* commit 'c132476af074aea8cd58f734140ff9b50698df2b':
Fix key label padding
2012-08-31 04:02:11 -07:00
Tadashi G. Takaoka
c132476af0
am 74b89db8: Merge "Fix key label padding" into jb-mr1-dev
...
* commit '74b89db8a4524cd702a46bc975a6af0e4fcfc7e4':
Fix key label padding
2012-08-31 04:00:15 -07:00
Tadashi G. Takaoka
74b89db8a4
Merge "Fix key label padding" into jb-mr1-dev
2012-08-31 03:58:21 -07:00
Tadashi G. Takaoka
36b5f4aae2
Fix key label padding
...
Change-Id: I971dd17afdaf1ce6e64e3c41bdb42a6ba3f6fd0e
2012-08-31 19:57:25 +09:00
Tadashi G. Takaoka
4b2aea9243
am 41f9ecec: am 9d05f36b: Use normal font for Arabic and Farsi
...
* commit '41f9ecec24e4a83ff1871c6333174d7e69a6c2a2':
Use normal font for Arabic and Farsi
2012-08-31 03:49:08 -07:00
Tadashi G. Takaoka
41f9ecec24
am 9d05f36b: Use normal font for Arabic and Farsi
...
* commit '9d05f36b77412e1a2e5e46002b851dd82f036232':
Use normal font for Arabic and Farsi
2012-08-31 03:47:22 -07:00
Tadashi G. Takaoka
518838b778
Use resource to specify 5-rows keyboard parameters
...
Change-Id: I67b290c4600dee43a81ba975ffc93a32a6d060b4
2012-08-31 19:14:33 +09:00
Tadashi G. Takaoka
9d05f36b77
Use normal font for Arabic and Farsi
...
Bug: 6753168
Change-Id: Iaef85847cf9f6c432c6ca25e7e6ec522c084d073
2012-08-31 18:56:50 +09:00
Yuichiro Hanada
3199af20bc
am 89affd30: am 666a4338: add UserHistoryDictIOUtils.
...
* commit '89affd30a9b8ef5205d59cb490a7b85b2b651351':
add UserHistoryDictIOUtils.
2012-08-31 01:04:13 -07:00
Yuichiro Hanada
89affd30a9
am 666a4338: add UserHistoryDictIOUtils.
...
* commit '666a4338026866df1f18dd6b3f968c3788943e4c':
add UserHistoryDictIOUtils.
2012-08-31 01:02:11 -07:00
Yuichiro Hanada
666a433802
add UserHistoryDictIOUtils.
...
Change-Id: I8a70e43b23f65b5fd5f0ee0b30a94ad8f5ef8a8a
2012-08-31 15:08:57 +09:00
Kurt Partridge
09d8dd7cff
am 6994f95e: am 9bbc7ec0: Merge changes Ifb983c35,I0b947421 into jb-mr1-dev
...
* commit '6994f95e2a88410140a2645abe257d58fb781106':
ResearchLogger clean up splash screen
ResearchLogger no longer offers option to disable logging
2012-08-30 23:01:43 -07:00
Kurt Partridge
6994f95e2a
am 9bbc7ec0: Merge changes Ifb983c35,I0b947421 into jb-mr1-dev
...
* commit '9bbc7ec052e3cb0a575fd56e5d8ddbc172841f6e':
ResearchLogger clean up splash screen
ResearchLogger no longer offers option to disable logging
2012-08-30 22:59:22 -07:00
Ken Wakasa
53688b1b68
am 724afc08: am 48643b08: Merge "add readUnigramsAndBigramsBinary." into jb-mr1-dev
...
* commit '724afc08f5e1492f0cb6fe1a96b4b39b5f802e01':
add readUnigramsAndBigramsBinary.
2012-08-30 22:59:13 -07:00
Kurt Partridge
9bbc7ec052
Merge changes Ifb983c35,I0b947421 into jb-mr1-dev
...
* changes:
ResearchLogger clean up splash screen
ResearchLogger no longer offers option to disable logging
2012-08-30 22:56:53 -07:00
Ken Wakasa
724afc08f5
am 48643b08: Merge "add readUnigramsAndBigramsBinary." into jb-mr1-dev
...
* commit '48643b08a989f158ea81d55ad904f2be4993bd93':
add readUnigramsAndBigramsBinary.
2012-08-30 22:56:50 -07:00
Ken Wakasa
48643b08a9
Merge "add readUnigramsAndBigramsBinary." into jb-mr1-dev
2012-08-30 22:55:12 -07:00
Kurt Partridge
25405eafb0
ResearchLogger clean up splash screen
...
- simpler text
- AlertDialog implementation
- declining users are redirected to regular IME
Bug: 6188932
Change-Id: Ifb983c3511125f8919f4a8b25aeee7de66dbb0cb
2012-08-30 22:52:00 -07:00
Kurt Partridge
58eb4d9f27
ResearchLogger no longer offers option to disable logging
...
Bug: 6188932
Change-Id: I0b9474216080f3820438c09f89b0b6c6c102c69d
2012-08-30 22:51:56 -07:00
Yuichiro Hanada
b2a43a2ed4
add readUnigramsAndBigramsBinary.
...
Change-Id: I7967f11211221d4877bf0a0c30183af885f45390
2012-08-31 14:39:19 +09:00
Tadashi G. Takaoka
2eddb3928b
am a7b81435: am 71b52a84: Move key label padding attributes back to KeyboardView
...
* commit 'a7b81435c569dc2ec34b9a5655d702720cb47d1c':
Move key label padding attributes back to KeyboardView
2012-08-30 22:15:29 -07:00
Tadashi G. Takaoka
a7b81435c5
am 71b52a84: Move key label padding attributes back to KeyboardView
...
* commit '71b52a84e2d078d0f57712dba88f8cc691412672':
Move key label padding attributes back to KeyboardView
2012-08-30 22:12:26 -07:00
Tadashi G. Takaoka
71b52a84e2
Move key label padding attributes back to KeyboardView
...
This is a partially reverting change of I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
Change-Id: Id213541cdddcc0761bf6418c8429a5f96c0281ef
2012-08-31 10:35:54 +09:00
The Android Automerger
f645ecf197
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:34:37 -07:00
Tadashi G. Takaoka
dc77512984
am 92a2c9b6: am 49d8af8a: Separate inner classes of KeyboardView out under internal package
...
* commit '92a2c9b64447ccbf2edcc55d89559ed3c251478c':
Separate inner classes of KeyboardView out under internal package
2012-08-30 00:29:08 -07:00
Tadashi G. Takaoka
cd9cdf4c1d
am abd665bd: am 749cc187: Move some key top visual attributes from KeyboardView to Key
...
* commit 'abd665bde9760348939dd3e619379cfc8e964fad':
Move some key top visual attributes from KeyboardView to Key
2012-08-30 00:27:42 -07:00
Tadashi G. Takaoka
92a2c9b644
am 49d8af8a: Separate inner classes of KeyboardView out under internal package
...
* commit '49d8af8a4e900f3c68c333aba7fde0a11fd368b1':
Separate inner classes of KeyboardView out under internal package
2012-08-30 00:26:37 -07:00
Tadashi G. Takaoka
abd665bde9
am 749cc187: Move some key top visual attributes from KeyboardView to Key
...
* commit '749cc1875164e38ca24d31d0d718603232abccb8':
Move some key top visual attributes from KeyboardView to Key
2012-08-30 00:25:06 -07:00
Tadashi G. Takaoka
49d8af8a4e
Separate inner classes of KeyboardView out under internal package
...
Change-Id: I6d53b53526bbab951044a026476bd88a9ebd5a90
2012-08-30 16:23:01 +09:00
Tadashi G. Takaoka
749cc18751
Move some key top visual attributes from KeyboardView to Key
...
Change-Id: I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
2012-08-30 16:14:32 +09:00
Tadashi G. Takaoka
9faef48e1e
am 8b782838: am 35ff9454: Separate inner classes of keyboard package out under internal package
...
* commit '8b782838fe031f5967d9d9827195a9849a10d73c':
Separate inner classes of keyboard package out under internal package
2012-08-29 23:49:54 -07:00