2740ccb564
am dd52a9dc: Reconcile with jb-release
...
* commit 'dd52a9dcada2c89a723c49b213c4679424ecc728':
2012-06-07 07:56:03 -07:00
dd52a9dcad
Reconcile with jb-release
...
Change-Id: I187fd2f871882b894e1c7db7b2ff61763f8bc090
2012-06-07 07:51:32 -07:00
eb284f6994
merge in jb-release history after reset to jb-dev
2012-06-07 07:04:50 -07:00
11dc22d964
Merge "Contacts binary dictionary updates with change in keyboard locale."
2012-06-07 01:19:44 -07:00
2e8aa06002
Contacts binary dictionary updates with change in keyboard locale.
...
Bug: 6616436
Change-Id: I8d66a37f295134c5b9875b2a305a9be7442bd75d
2012-06-07 00:25:41 -07:00
c8a120f970
am eead5492: am 769cecf7: Close spell-checking dictionaries in a background thread
...
* commit 'eead5492615f0b05ef85ca1f88d3a41ce3f8d496':
Close spell-checking dictionaries in a background thread
2012-06-06 21:52:46 -07:00
eead549261
am 769cecf7: Close spell-checking dictionaries in a background thread
...
* commit '769cecf7e79dc6e2a98e527bdb9943bef9a42396':
Close spell-checking dictionaries in a background thread
2012-06-06 21:50:38 -07:00
769cecf7e7
Close spell-checking dictionaries in a background thread
...
Bug: 6584677
Change-Id: Ifd9b0f995f4e0cf4d35a7ecde767826ab976f0b8
2012-06-07 12:56:45 +09:00
9b300f0caa
Merge "add research log ui control"
2012-06-06 20:47:53 -07:00
724bc479f7
add research log ui control
...
- lets users flag a particular time in the research log
- lets users delete the log for this session
also makes the UsabilityLog setting control whether the ResearchLog logs or not.
multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe
Bug: 6188932
Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399
2012-06-06 20:42:01 -07:00
4fff6a0498
am c27646cd: (-s ours) am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'c27646cd2705786b33e23edd7f3902e40afecab8':
Import translations. DO NOT MERGE
2012-06-06 17:14:01 -07:00
c27646cd27
am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '69b4e411e1666a7a4abed72ab5484878b24cba35':
Import translations. DO NOT MERGE
2012-06-06 17:11:23 -07:00
f4d42d07ac
Merge "Import translations. DO NOT MERGE"
2012-06-06 17:09:37 -07:00
69b4e411e1
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-06 17:09:28 -07:00
2efdf6a09f
Import translations. DO NOT MERGE
...
Change-Id: I7718b03a6f995edfb3cce07f761a4f56d573aa1b
2012-06-06 14:06:59 -07:00
80a53c0b74
Import translations. DO NOT MERGE
...
Change-Id: I6c285a7484375ce4aa4569af6249027f84711d60
2012-06-06 14:03:28 -07:00
baad1d162c
am 55628748: am 95ab6fff: Merge "Change spacebar and language switch key background color of phone" into jb-dev
...
* commit '5562874831219d5622b5d194fd3ee3e15251202d':
Change spacebar and language switch key background color of phone
2012-06-06 10:51:07 -07:00
91c8c4f3a7
am e08cfda1: am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
...
* commit 'e08cfda1ebea693c56681816076c419f23c51076':
Cache UserHistoryDictionary for each language
2012-06-06 10:48:46 -07:00
7520164ede
am 269792b3: am 052a8205: Microphone key on 10-inch tablet on the far right vs where it is on phones
...
* commit '269792b384b356601f7b4bf08f487803f5710b68':
Microphone key on 10-inch tablet on the far right vs where it is on phones
2012-06-06 10:48:45 -07:00
5562874831
am 95ab6fff: Merge "Change spacebar and language switch key background color of phone" into jb-dev
...
* commit '95ab6fff29b83434307a1705bfe68d30bf440237':
Change spacebar and language switch key background color of phone
2012-06-06 10:48:40 -07:00
754b385dc3
am 960dce05: am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is on phones
...
* commit '960dce0579d4a113c2a2ebf8f8279f2a64e09581':
Microphone key on 7-inch tablet on the far right vs where it is on phones
2012-06-06 10:46:21 -07:00
e08cfda1eb
am 5a8d2fd1: Merge "Cache UserHistoryDictionary for each language" into jb-dev
...
* commit '5a8d2fd1d353b2039f0d340301f9dac779cb4e64':
Cache UserHistoryDictionary for each language
2012-06-06 10:46:17 -07:00
269792b384
am 052a8205: Microphone key on 10-inch tablet on the far right vs where it is on phones
...
* commit '052a82057b0b54e2c40191098a368adcc1e37e74':
Microphone key on 10-inch tablet on the far right vs where it is on phones
2012-06-06 10:46:15 -07:00
95ab6fff29
Merge "Change spacebar and language switch key background color of phone" into jb-dev
2012-06-06 10:46:14 -07:00
5a8d2fd1d3
Merge "Cache UserHistoryDictionary for each language" into jb-dev
2012-06-06 10:43:50 -07:00
960dce0579
am 268a442d: Microphone key on 7-inch tablet on the far right vs where it is on phones
...
* commit '268a442dc4b68faa6ab9355ea634bd76892a4642':
Microphone key on 7-inch tablet on the far right vs where it is on phones
2012-06-06 10:43:45 -07:00
562239bf51
am 59dae7e1: am 907ba593: Can specify Key.backgroundType in <Row> and <include> attribute
...
* commit '59dae7e141b6d6a8bea287f6699e34137390c5f9':
Can specify Key.backgroundType in <Row> and <include> attribute
2012-06-06 10:42:38 -07:00
052a82057b
Microphone key on 10-inch tablet on the far right vs where it is on phones
...
This change also re-introduces colored action key, that was disbaled
by I1c7335c5.
Bug: 6568834
Change-Id: I0c04b86049325c84492d90457cee0c16c57937f8
2012-06-06 10:41:17 -07:00
59dae7e141
am 907ba593: Can specify Key.backgroundType in <Row> and <include> attribute
...
* commit '907ba593975d5761f5ba01e689ae2d978b63c2f3':
Can specify Key.backgroundType in <Row> and <include> attribute
2012-06-06 10:39:53 -07:00
268a442dc4
Microphone key on 7-inch tablet on the far right vs where it is on phones
...
Bug: 6568834
Change-Id: If48635ead60dc119656f1b10c9b05a1918ebd668
2012-06-06 10:38:50 -07:00
2bf014d2a8
Fix xml tag in comment
...
Bug: 6620122
Change-Id: I2852f77d78b242c1a96c53cdd1e4c0e299f8ea4f
2012-06-06 10:36:30 -07:00
907ba59397
Can specify Key.backgroundType in <Row> and <include> attribute
...
Bug: 6568834
Change-Id: I138464b5445e13eaf062ce84a1ba332dfd1afafa
2012-06-06 10:15:51 -07:00
c01b9c7fc2
merge in jb-release history after reset to jb-dev
2012-06-06 07:04:48 -07:00
a836808f8b
Cache UserHistoryDictionary for each language
...
Bug: 6603257
Change-Id: I73b65e921cff8337a00594525f67f6aec2178881
2012-06-06 20:02:00 +09:00
21b782cf22
Merge "Cache bigram results in Android SpellChecker"
2012-06-06 01:01:47 -07:00
547bc0cf04
Cache bigram results in Android SpellChecker
...
Bug: 6610579
Change-Id: I255c068f64f99ee80abda49153ed8ea009ca8ad3
2012-06-06 16:58:24 +09:00
6b3b37da97
Merge "Change constants in ResearchLogger"
2012-06-05 20:17:14 -07:00
876711930d
am 2eb5eb4d: am be2fef4d: Merge "Fix backing view height calculation in landscape orientation" into jb-dev
...
* commit '2eb5eb4d447cb326b4c10cff2cae64df4e431ffd':
Fix backing view height calculation in landscape orientation
2012-06-05 17:58:59 -07:00
2eb5eb4d44
am be2fef4d: Merge "Fix backing view height calculation in landscape orientation" into jb-dev
...
* commit 'be2fef4d5e3630c676cbfecf97e1de2f98284eb7':
Fix backing view height calculation in landscape orientation
2012-06-05 17:56:47 -07:00
be2fef4d5e
Merge "Fix backing view height calculation in landscape orientation" into jb-dev
2012-06-05 17:54:42 -07:00
b94f4cc71c
Fix backing view height calculation in landscape orientation
...
This logic has been dropped by Ib814c07f.
Bug: 6610497
Change-Id: Id89ad3280b73a31d8c9c6826e9ee297791624db1
2012-06-05 17:41:01 -07:00
7b250c25f7
am 6b0d0fa3: am f8233ec3: Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev
...
* commit '6b0d0fa3501247ccf3190c938dec580102fe0473':
Refresh Accessibility key mapping when KeyboardView changes Keyboards.
2012-06-05 15:02:27 -07:00
fe734c49df
am 79a97926: (-s ours) am 2493778f: Import translations. DO NOT MERGE
...
* commit '79a979266d4b64213705a90583bff8847b6ebe64':
Import translations. DO NOT MERGE
2012-06-05 15:02:27 -07:00
6b0d0fa350
am f8233ec3: Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev
...
* commit 'f8233ec32d7ff4cf0874cfe68cef1a32f763184a':
Refresh Accessibility key mapping when KeyboardView changes Keyboards.
2012-06-05 15:00:20 -07:00
79a979266d
am 2493778f: Import translations. DO NOT MERGE
...
* commit '2493778faf62b85e8e90947c20b7f066d7da9abe':
Import translations. DO NOT MERGE
2012-06-05 15:00:19 -07:00
f8233ec32d
Merge "Refresh Accessibility key mapping when KeyboardView changes Keyboards." into jb-dev
2012-06-05 14:55:59 -07:00
01f15e45b6
Merge "Import translations. DO NOT MERGE"
2012-06-05 14:53:02 -07:00
26d24edde8
Import translations. DO NOT MERGE
...
Change-Id: I851b9388ec7faa95ff762bcbf748f03cc2559b0c
2012-06-05 12:45:53 -07:00
2493778faf
Import translations. DO NOT MERGE
...
Change-Id: I0b461b9a136cc170cd4e9bfdfa9df93e08ed5d0a
2012-06-05 12:43:33 -07:00
f147794fd4
Refresh Accessibility key mapping when KeyboardView changes Keyboards.
...
Bug: 6609626
Change-Id: I93d764b46e96fe70b61c91a7dcb46945ac8853dd
2012-06-05 11:02:54 -07:00
The Android Open Source Project
The Android Automerger
Tom Ouyang
Jean Chalard
Kurt Partridge
Eric Fischer
Tadashi G. Takaoka
Satoshi Kataoka
Charles Chen
alanv