Commit graph

34684 commits

Author SHA1 Message Date
Jatin Matani
3b0c2eb09f Merge "Avoid NPE when logging the entry point to Settings" 2015-03-24 19:57:08 +00:00
Jatin Matani
2fb8e5eecf Avoid NPE when logging the entry point to Settings
The populator class that serializes the proto uses a switch
and throws an NPE.

Bug:19911288
Change-Id: Id0fa371b3c64e706e14a13bb6e643406f94be035
2015-03-24 12:25:22 -07:00
Dan Zivkovic
a8b14a4fdd Merge "Change DictionaryStats to report content version." 2015-03-24 19:20:27 +00:00
Ulas Kirazci
e1b91d4138 Merge "DO NOT MERGE. Do not access metadatadb from main thread." 2015-03-24 18:28:53 +00:00
Dan Zivkovic
72278d3047 Change DictionaryStats to report content version.
Bug 19908719.

Change-Id: I5a00b5277e9cd7d964b53ff5823bada21be110fa
2015-03-24 11:19:34 -07:00
Dan Zivkovic
3b6dc20ed8 am 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
* commit '823aaf0f7d90823671fc4aabce6e56145f29921a':
  Block overflow menu during setup. DO NOT MERGE
2015-03-24 03:25:17 +00:00
Chieu Nguyen
37cb7a7371 Merge "Disable Hinglish locale." 2015-03-24 01:34:02 +00:00
Chieu Nguyen
f74005d888 Remove dependency in correction settings.
Autocorrection and next-word suggestion are independent,
but the settings UI creates a dependency.

Bug: 19896768.
Change-Id: Ibcdd497cdfd7b9c3a69c61e0c2d116d67df84ef8
2015-03-23 18:13:03 -07:00
Chieu Nguyen
67bb8cbe61 Disable Hinglish locale.
Bug: 19899126.
Change-Id: I1824233b3bcb6cb6579714a7eb375ea2cebc39db
2015-03-23 18:05:04 -07:00
Chieu Nguyen
fac1f631b9 Merge "Reenable next-word suggestion if autocorrection reenabled." 2015-03-24 00:25:47 +00:00
Dan Zivkovic
c4f71f6be8 Merge "We can't spell check Russian without an LM." 2015-03-24 00:25:34 +00:00
Chieu Nguyen
1eedcfb290 Reenable next-word suggestion if autocorrection reenabled.
Bug: 19896768.
Change-Id: Ifeb3401612416e58bb362c5250ce0c15fc4b3c45
2015-03-23 17:16:10 -07:00
Dan Zivkovic
4262ef4e11 We can't spell check Russian without an LM.
Change-Id: I635a51acc2e45aebe23a1cf69da1b5c72a6ac9e1
2015-03-23 16:37:13 -07:00
Dan Zivkovic
823aaf0f7d am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
* commit 'c787bd666330f872e2f3aff0d3f590724f95d574':
  Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:22:26 +00:00
Dan Zivkovic
c787bd6663 am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
* commit '6f09e99d24b4f67ef14d78a18a246da67cca650e':
  Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:16:51 +00:00
Dan Zivkovic
6f09e99d24 am 2bc9f407: Block overflow menu during setup. DO NOT MERGE
* commit '2bc9f4073d872ac3ffb56e44bef39e24da12a66f':
  Block overflow menu during setup. DO NOT MERGE
2015-03-23 23:10:58 +00:00
Qiwen Zhao
67c06fc2b8 am c9e43b1d: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
* commit 'c9e43b1dbbefcc5cafea87976e9f6a59163731a0':
2015-03-23 22:43:59 +00:00
Dan Zivkovic
2bc9f4073d Block overflow menu during setup. DO NOT MERGE
Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
(cherry picked from commit 75fc9080a8)
2015-03-23 21:43:52 +00:00
Dan Zivkovic
ffd808b446 We ship with English, so we can't unit test French
Change-Id: I20a470a18ca0cd47fe7588958be904eb23fdf1a2
2015-03-23 14:42:10 -07:00
Dan Zivkovic
3e792f61ad Minor unit test fixes.
Change-Id: I800bb33a10f31d5b934b00768bc8fe4776e36f90
2015-03-23 13:31:51 -07:00
Jatin Matani
fa296fa625 Merge "Move ManagedProfileUtils to overridable" 2015-03-23 20:17:13 +00:00
Dan Zivkovic
e02d483187 Merge "Block overflow menu during setup." 2015-03-23 20:13:16 +00:00
Jatin Matani
cb27c4fe2e Move ManagedProfileUtils to overridable
Bug:19532354
Change-Id: I50b3ae11b6e58f07b482353b624b1a7a73eadc99
2015-03-23 11:57:48 -07:00
Dan Zivkovic
75fc9080a8 Block overflow menu during setup.
Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
2015-03-23 11:34:02 -07:00
Jatin Matani
bc1cf0817b Merge "Fix some i18n messaging" 2015-03-23 18:20:49 +00:00
Geoff Mendal
13271bfde8 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:57:25 +00:00
Geoff Mendal
772d823ec8 Import translations. DO NOT MERGE
Change-Id: Iff35b6266f1f7249bd4a506f6667fef40eddb530
Auto-generated-cl: translation import
2015-03-20 23:56:44 -07:00
Geoff Mendal
479a70900d Merge "Import translations. DO NOT MERGE" 2015-03-21 06:56:24 +00:00
Geoff Mendal
23c18bba30 Import translations. DO NOT MERGE
Change-Id: Ia8ca67d58e6b3e6325da4f3711aa9dc3a7a1c355
Auto-generated-cl: translation import
2015-03-20 23:55:58 -07:00
Geoff Mendal
eb5bbdee59 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:55:18 +00:00
Geoff Mendal
93b18efaac Import translations. DO NOT MERGE
Change-Id: I4ab87513a95932a4c68ee21002a4784d8d577d68
Auto-generated-cl: translation import
2015-03-20 23:54:53 -07:00
Geoff Mendal
ed7688c342 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:54:44 +00:00
Geoff Mendal
cdda9eac21 Import translations. DO NOT MERGE
Change-Id: Id1e2004e85354dbc48b0bd4104ebc1cf8439161c
Auto-generated-cl: translation import
2015-03-20 23:54:13 -07:00
Geoff Mendal
2dfde3bec7 Merge "Import translations. DO NOT MERGE" 2015-03-21 06:53:35 +00:00
Geoff Mendal
aacf1d1494 Import translations. DO NOT MERGE
Change-Id: I256ea01e4447fdf2b485d53706b5e69b50a592a3
Auto-generated-cl: translation import
2015-03-20 23:53:13 -07:00
Geoff Mendal
cef1e8da6b Merge "Import translations. DO NOT MERGE" 2015-03-21 06:52:54 +00:00
Geoff Mendal
77d728c4b9 Import translations. DO NOT MERGE
Change-Id: Ibf4c8f681d36736a7e7b1c1568cb688bd15d09bd
Auto-generated-cl: translation import
2015-03-20 23:52:39 -07:00
Geoff Mendal
f5933bcf42 Import translations. DO NOT MERGE
Change-Id: I838ad0471c73777e92031acd2713a95378de4535
Auto-generated-cl: translation import
2015-03-20 23:51:57 -07:00
Qiwen Zhao
c9e43b1dbb reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE. 2015-03-20 21:25:25 -07:00
Tadashi G. Takaoka
96a96d0662 am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev
* commit 'c24340f956c16d8594c44d45685f8a814538245b':
2015-03-20 23:30:32 +00:00
Tadashi G. Takaoka
bd49b0fd26 am 1073ef97: am 1bb20aa0: am 31544dcb: Add xxxhdpi assets
* commit '1073ef9756617ecd2b4eeddca045039d9e6f3d14':
2015-03-20 23:30:30 +00:00
Yohei Yukawa
fbaac52d25 am ead70974: am 27ccbeb4: am cd119050: Support CursorAnchorInfo in the full-screen mode
* commit 'ead70974aecd78d5bad0fa87a759f6bf82dcb503':
2015-03-20 23:30:28 +00:00
Tadashi G. Takaoka
bdcd606848 am c29276b7: am 12814352: am 486c4894: Keep aspect ratio of Material action key background
* commit 'c29276b782cfc45be5ab79177e991f2cba8fb04b':
2015-03-20 23:30:27 +00:00
Jean Chalard
68c6091715 am beb74610: am ab18b5f1: am 9395014e: Don\'t resume suggestions with H/W keyboard
* commit 'beb746103011149d6dfce10278475946e679263d':
2015-03-20 23:30:25 +00:00
Jean Chalard
116a2565a4 am 61e7afa6: am 0eaa25e0: am 914078fd: Fix a bug where recorrection would stop on connectors
* commit '61e7afa6fa98939f9dcb9f7a2ebb5678a51d4201':
2015-03-20 23:30:23 +00:00
Tadashi G. Takaoka
94b6f21bf6 am 50e8d585: am 56c7ceb4: am 42665f0e: Merge "Mark isDefault="true" for all supported subtypes" into lmp-dev
* commit '50e8d5854b981b7fbad24fdb9c141ddf39eb904a':
2015-03-20 23:30:22 +00:00
Yohei Yukawa
f21fea6017 am 42ddc212: am f930ce12: am 1caa0b71: Merge "Follow up API signature changes of CursorAnchorInfo" into lmp-dev
* commit '42ddc2127deb117a0bb2b7a7797cb8c9ba335f5a':
2015-03-20 23:30:20 +00:00
Jean Chalard
7e82f99ec6 am c3fac52d: am 1f74ba17: am cb077f75: Merge "Resolve an old TODO." into lmp-dev
* commit 'c3fac52dd51ba70db83d96b2d421bd440683d9bc':
2015-03-20 23:30:18 +00:00
Yohei Yukawa
76f6adb03d am c1ee8857: am a6c53d31: am 257dfa79: Merge "Revert "Use right arrow for the commit indicator"" into lmp-dev
* commit 'c1ee88572232235d5972220ec1e5232de58a916e':
2015-03-20 23:30:14 +00:00
Tadashi G. Takaoka
c4b6a8c728 am ad4de3fc: am 9ca6658e: am 0f33e614: Implement Floating Action Button more keys keyboard
* commit 'ad4de3fc819d658775eed470fc74ad76da5caad2':
2015-03-20 23:30:12 +00:00