Tim Murray
5d44dfe005
am ea3bc5ca
: am da9cc773
: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'ea3bc5caac38ccfd59c4fba957b4102e049e8f9f':
Use default compiler flags for dicttool.
2014-07-24 21:27:56 +00:00
Tim Murray
ea3bc5caac
am da9cc773
: resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
* commit 'da9cc77339b18e3624efe99684a4d1511a02a8f9':
Use default compiler flags for dicttool.
2014-07-24 21:25:56 +00:00
Tim Murray
da9cc77339
resolved conflicts for merge of 159474f2
to lmp-dev-plus-aosp
...
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
Stephen Hines
ed40eac86a
am 578c6311
: am 5a289ed2
: Revert "Revert "Revert "Use mclinker"""
...
* commit '578c6311548e3f85e6b8c8800a66eb252e6b42f7':
Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:08:29 +00:00
Tadashi G. Takaoka
9a3905beca
am 456cc996
: am a270ac4a
: Remove unnecessary DebugSettingsActivity, use fragment directly
...
* commit '456cc9967831337c759ae2ba9c6a5621ef776110':
Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:08:27 +00:00
Stephen Hines
578c631154
am 5a289ed2
: Revert "Revert "Revert "Use mclinker"""
...
* commit '5a289ed29345e545742bc33728d7010b5e2c1e65':
Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:01:01 +00:00
Tadashi G. Takaoka
456cc99678
am a270ac4a
: Remove unnecessary DebugSettingsActivity, use fragment directly
...
* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7':
Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:01:00 +00:00
Stephen Hines
5a289ed293
Revert "Revert "Revert "Use mclinker"""
...
This reverts commit b48c93b3fc
.
MCLinker is not a valid option for clang 3.5.
2014-07-23 19:58:17 -07:00
Tadashi G. Takaoka
a270ac4a61
Remove unnecessary DebugSettingsActivity, use fragment directly
...
This CL must be checked in together with I1db2e848ab.
Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
2014-07-23 17:09:46 -07:00
Tim Murray
159474f2ae
Merge "Use default compiler flags for dicttool."
2014-07-23 18:45:08 +00:00
Tim Murray
dd28478f5c
Use default compiler flags for dicttool.
...
Not using this causes the triple to not be passed to clang, breaking Darwin.
bug 16172793
Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-23 21:44:25 -07:00
Baligh Uddin
ba8f6e0bcb
am 129f0586
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '129f05867fc881aca96c21ae2b8aac7ae0440c42':
Import translations. DO NOT MERGE
2014-07-22 17:48:27 +00:00
Baligh Uddin
3e8d3e85ea
am 9f147c13
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '9f147c1337feaf0d3903381c4ccd0ce8995ac201':
Import translations. DO NOT MERGE
2014-07-22 17:48:26 +00:00
Baligh Uddin
47e39a8e61
am f1e3f9df
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'f1e3f9df51157435e9fa87b4fe243fac3a71ab42':
Import translations. DO NOT MERGE
2014-07-22 17:48:25 +00:00
Baligh Uddin
816b238ade
am 05a2e8de
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '05a2e8dea5cc839473e116bcd328370e9a02e54f':
Import translations. DO NOT MERGE
2014-07-22 17:48:23 +00:00
Baligh Uddin
5ccc7c664f
am f9efaad4
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f9efaad468c72df362f79bb3fc542b64aeb4d0bc':
Import translations. DO NOT MERGE
2014-07-22 17:48:22 +00:00
Baligh Uddin
f9efaad468
Import translations. DO NOT MERGE
...
Change-Id: I2f8c16e0dcaf894d2c0acb70c5804969ac618500
Auto-generated-cl: translation import
2014-07-22 17:44:19 +00:00
Baligh Uddin
58ad6c4805
Import translations. DO NOT MERGE
...
Change-Id: Ic1191118d6f8d9dc2bcc6c293c4ffa0f86be34c6
Auto-generated-cl: translation import
2014-07-22 17:39:41 +00:00
Baligh Uddin
f1e3f9df51
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:29:55 +00:00
Baligh Uddin
c1d2124a3e
Import translations. DO NOT MERGE
...
Change-Id: I8ffb44bf95c317dca14df03e5627bd9870acccb5
Auto-generated-cl: translation import
2014-07-22 17:44:08 +00:00
Baligh Uddin
129f05867f
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:21:19 +00:00
Baligh Uddin
8fc6b5a820
Import translations. DO NOT MERGE
...
Change-Id: I8916526987bd2008b85222124bf465114e4d592c
Auto-generated-cl: translation import
2014-07-22 17:43:50 +00:00
Baligh Uddin
9f147c1337
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:21:19 +00:00
Baligh Uddin
e13e675cdc
Import translations. DO NOT MERGE
...
Change-Id: I95653f0874ab89771a1aa60cb3a01cb3cfedf01a
Auto-generated-cl: translation import
2014-07-22 17:44:02 +00:00
Baligh Uddin
05a2e8dea5
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:21:19 +00:00
Baligh Uddin
ef29c1cd61
Import translations. DO NOT MERGE
...
Change-Id: I844a25e74c1cd451523248ae0d09ba9d40c3d09d
Auto-generated-cl: translation import
2014-07-22 17:44:14 +00:00
Baligh Uddin
e466494aa4
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2014-07-22 16:21:19 +00:00
Baligh Uddin
3d2d4280c0
Import translations. DO NOT MERGE
...
Change-Id: Ie5e463b792381613105191536f50f20a05a76916
Auto-generated-cl: translation import
2014-07-22 17:43:56 +00:00
Baligh Uddin
d700afb9f1
am 58ad6c48
: (-s ours) Import translations. DO NOT MERGE
...
* commit '58ad6c4805c56b00f9d0bcaacb523d86912b647b':
Import translations. DO NOT MERGE
2014-07-22 17:43:52 +00:00
Yohei Yukawa
ec626d4bfe
am e2ceff04
: am 3f513f10
: Enable InputMethodService#onUpdateCursor behind the flag
...
* commit 'e2ceff04582791af2d25facfa5124b44ea95de3b':
Enable InputMethodService#onUpdateCursor behind the flag
2014-07-21 18:37:30 +00:00
Yohei Yukawa
d8f522b6ce
am 4deb5dc9
: am 6b14bbf1
: Fix build breakage in dicttool
...
* commit '4deb5dc9a209b2e2ce9847a144f3f84008ea3d53':
Fix build breakage in dicttool
2014-07-21 18:37:29 +00:00
Yohei Yukawa
14ee576911
am 21036c27
: am 91e7daad
: Merge "Use CharSequence for spell checker to keep spans preserved" into lmp-dev
...
* commit '21036c277648bf43b40295dc0da6972354f57b57':
Use CharSequence for spell checker to keep spans preserved
2014-07-21 18:37:28 +00:00
Baligh Uddin
de339deb7f
am 1dbbd557
: (-s ours) am 8279b9d4
: (-s ours) Remove deprecated locales - DO NOT MERGE
...
* commit '1dbbd557112d67768bbda49ece657554bb2be3c7':
Remove deprecated locales - DO NOT MERGE
2014-07-21 18:37:26 +00:00
Yohei Yukawa
9a9893d1a2
am 080eba65
: am 22ba22f3
: Merge "Add two convenient utility methods for L new API" into lmp-dev
...
* commit '080eba652d2aba82d8b86a84a166529ca9303714':
Add two convenient utility methods for L new API
2014-07-21 18:37:25 +00:00
Tadashi G. Takaoka
86b59df23c
am ec8d08af
: am 34da7494
: Merge "Update Hindi Compact keyboard layout" into lmp-dev
...
* commit 'ec8d08af28a598ab0321ffdb7aa302d95a99ec55':
Update Hindi Compact keyboard layout
2014-07-21 18:37:24 +00:00
Tadashi G. Takaoka
348430afde
am 9c6abf3e
: am 639c93f4
: Remove unused Key.keyLabelFlags\' values
...
* commit '9c6abf3eceea1090021efad12f86379c27efdbc1':
Remove unused Key.keyLabelFlags' values
2014-07-21 18:37:22 +00:00
Yohei Yukawa
7dea6dab01
am dba82c67
: am 5bb0bff0
: Merge "Enable StringUtils to split CharSequence like String#split" into lmp-dev
...
* commit 'dba82c677a0bca0aac9d4847f5833baa74c91242':
Enable StringUtils to split CharSequence like String#split
2014-07-21 18:37:21 +00:00
Tadashi G. Takaoka
d93f8c5947
am f6785ea5
: am de1ab73e
: Use Theme.DeviceDefault theme
...
* commit 'f6785ea588799bf58140f2b315098e0b165f7665':
Use Theme.DeviceDefault theme
2014-07-21 18:37:20 +00:00
Yohei Yukawa
e2ceff0458
am 3f513f10
: Enable InputMethodService#onUpdateCursor behind the flag
...
* commit '3f513f107ef0754da2b1c704167325151ce9b7ea':
Enable InputMethodService#onUpdateCursor behind the flag
2014-07-21 18:28:37 +00:00
Yohei Yukawa
4deb5dc9a2
am 6b14bbf1
: Fix build breakage in dicttool
...
* commit '6b14bbf125f2957ffb3ab5072eb9376981af9a17':
Fix build breakage in dicttool
2014-07-21 18:28:36 +00:00
Yohei Yukawa
21036c2776
am 91e7daad
: Merge "Use CharSequence for spell checker to keep spans preserved" into lmp-dev
...
* commit '91e7daaddf72008b3e2f5a9cbc23ded56b6bdffa':
Use CharSequence for spell checker to keep spans preserved
2014-07-21 18:28:35 +00:00
Baligh Uddin
1dbbd55711
am 8279b9d4
: (-s ours) Remove deprecated locales - DO NOT MERGE
...
* commit '8279b9d4a9529448b526321ff76eff6a1c2f13f4':
Remove deprecated locales - DO NOT MERGE
2014-07-21 18:28:34 +00:00
Yohei Yukawa
080eba652d
am 22ba22f3
: Merge "Add two convenient utility methods for L new API" into lmp-dev
...
* commit '22ba22f32dc9d59a0dccc8d1bca7aaee90e90b2a':
Add two convenient utility methods for L new API
2014-07-21 18:28:33 +00:00
Tadashi G. Takaoka
ec8d08af28
am 34da7494
: Merge "Update Hindi Compact keyboard layout" into lmp-dev
...
* commit '34da7494374d44b37d051c6c1a967d6c243ac5a7':
Update Hindi Compact keyboard layout
2014-07-21 18:28:32 +00:00
Tadashi G. Takaoka
9c6abf3ece
am 639c93f4
: Remove unused Key.keyLabelFlags\' values
...
* commit '639c93f43bc51a8328d7dc11a09a3bd77974aeae':
Remove unused Key.keyLabelFlags' values
2014-07-21 18:28:30 +00:00
Yohei Yukawa
dba82c677a
am 5bb0bff0
: Merge "Enable StringUtils to split CharSequence like String#split" into lmp-dev
...
* commit '5bb0bff0e4ae0553c3732378d1e328b9fea0b88d':
Enable StringUtils to split CharSequence like String#split
2014-07-21 18:28:28 +00:00
Tadashi G. Takaoka
f6785ea588
am de1ab73e
: Use Theme.DeviceDefault theme
...
* commit 'de1ab73efbe3520059647924857a2d7b82e2fbe7':
Use Theme.DeviceDefault theme
2014-07-21 18:28:17 +00:00
Yohei Yukawa
3f513f107e
Enable InputMethodService#onUpdateCursor behind the flag
...
With this CL, InputMethodService#onUpdateCursor and
InputMethodService#onUpdateCursorAnchorInfo can be enabled
on L when ENABLE_CURSOR_ANCHOR_INFO_CALLBACK and
ENABLE_CURSOR_RECT_CALLBACK are specified, respectively.
BUG: 16382260
Change-Id: I29924128f6bd2f08cbd91cc4e82c9c4a6ecce3ff
2014-07-20 20:56:52 +09:00
Yohei Yukawa
6b14bbf125
Fix build breakage in dicttool
...
This CL fixes the build breakage caused by I0dd103185dcf62fb1e2505
due to the lack of android.text.Spanned in host environment.
BUG: 16029304
Change-Id: Ic966d10e8abe2c2be8d62c09d1502574535aa8b8
2014-07-20 12:46:34 +09:00
Baligh Uddin
8279b9d4a9
Remove deprecated locales - DO NOT MERGE
...
Change-Id: I8c1efe2343eea40faf7a690518c500af86c1c323
2014-07-20 02:27:29 +00:00