1f6cc6fb57
am a0a37bd3: am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'a0a37bd368c2570f60106f30391d413e48d80f42':
Use fragment for multi lingual preference screen
2014-07-28 12:18:09 +00:00
275079c9ae
am d33f7e84: am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'd33f7e84ab44bb27c82c300b431518bb48919883':
Fix a verifier error on ICS.
2014-07-28 12:18:08 +00:00
18855ae268
am 081a4177: am c140938d: am bfcd98ed: Use fragment for input preference screen
...
* commit '081a4177e482727cc27e686607c02cf9f099a64d':
Use fragment for input preference screen
2014-07-28 12:18:06 +00:00
ed65482cc7
am 4dba300e: am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit '4dba300e50587f1bc9c1c5ca7bd98adc1781bdf5':
Make "Show correction suggestions" as a binary option
2014-07-28 12:18:04 +00:00
a0a37bd368
am beffde59: am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'beffde59c36515f77946b35c2b0279413a1df69f':
Use fragment for multi lingual preference screen
2014-07-28 12:14:21 +00:00
d33f7e84ab
am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
Fix a verifier error on ICS.
2014-07-28 12:14:20 +00:00
081a4177e4
am c140938d: am bfcd98ed: Use fragment for input preference screen
...
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
Use fragment for input preference screen
2014-07-28 12:14:19 +00:00
4dba300e50
am 26a29865: am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit '26a2986581410536a98e1c311214dc90d9934546':
Make "Show correction suggestions" as a binary option
2014-07-28 12:14:18 +00:00
beffde59c3
am 1da43854: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit '1da438549368e74d55017c36d666673ad608a5c4':
Use fragment for multi lingual preference screen
2014-07-28 12:09:05 +00:00
ac82983f65
am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit '6d7a08107cd62620a2a07d445686e76c2d660bcf':
Fix a verifier error on ICS.
2014-07-28 12:09:04 +00:00
c140938d99
am bfcd98ed: Use fragment for input preference screen
...
* commit 'bfcd98edc7c5ac28fdc1e4b7a97b2912124e622a':
Use fragment for input preference screen
2014-07-28 12:09:03 +00:00
26a2986581
am ab661e3e: Make "Show correction suggestions" as a binary option
...
* commit 'ab661e3ef886a36b02fe094864ae4be6a3260f71':
Make "Show correction suggestions" as a binary option
2014-07-28 12:09:02 +00:00
bfcd98edc7
Use fragment for input preference screen
...
This CL introduces a common abstract class, SunScreenFragment, for
PreferenceFragment that implements a PreferenceScreen of the main
settings preference screen.
Bug: 16522808
Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
2014-07-27 16:06:52 +09:00
ab661e3ef8
Make "Show correction suggestions" as a binary option
...
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.
Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
2014-07-27 14:47:07 +09:00
f7828313ef
am 2dc3a510: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2dc3a51001996a59ab6ea9556a3815159702c202':
Import translations. DO NOT MERGE
2014-07-25 16:37:10 +00:00
6c627db6b6
am 862fa431: am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '862fa431df2174f2d45045353cdcf29e508dbd15':
Add BufferWithExtendablebufferTest
2014-07-25 02:03:59 +00:00
e127672661
am 917f8002: am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '917f8002c0eb310da517ec97b235fada60978996':
Add BufferWithExtendableBuffer::extend()
2014-07-25 02:03:58 +00:00
6bd15b8662
am e32cb6f8: am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'e32cb6f8f267ce044c2880106e5a5a309ec9dc33':
Refactoring checkAndPrepareWriting.
2014-07-25 02:03:56 +00:00
862fa431df
am 370ffb42: am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '370ffb424f4d03143c7e5d8186206e58e6fb4021':
Add BufferWithExtendablebufferTest
2014-07-24 23:59:07 +00:00
917f8002c0
am 90ac50ee: am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit '90ac50ee433d7ecb1a89da242d0d99b882169d17':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:59:06 +00:00
e32cb6f8f2
am 16665da2: am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit '16665da28091f977e92dd0382eb3adefc8478f36':
Refactoring checkAndPrepareWriting.
2014-07-24 23:59:05 +00:00
370ffb424f
am 825243bf: Merge "Add BufferWithExtendablebufferTest" into lmp-dev
...
* commit '825243bfdd6fb63c2ef8bf99024bb06e6f52e946':
Add BufferWithExtendablebufferTest
2014-07-24 23:37:03 +00:00
90ac50ee43
am dfbe2a8c: Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
...
* commit 'dfbe2a8ca80ef73a0bc1364cf5964db2141a2a86':
Add BufferWithExtendableBuffer::extend()
2014-07-24 23:36:16 +00:00
16665da280
am f78eb27c: Merge "Refactoring checkAndPrepareWriting." into lmp-dev
...
* commit 'f78eb27c7e563d0bbe10239ec7d9941fd170e597':
Refactoring checkAndPrepareWriting.
2014-07-24 23:35:45 +00:00
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
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
da9cc77339
resolved conflicts for merge of 159474f2 to lmp-dev-plus-aosp
...
Change-Id: Ie133ba3e80132d711796d0de6c5ae611f7e43365
2014-07-24 14:21:52 -07:00
2dc3a51001
Merge "Import translations. DO NOT MERGE"
2014-07-24 20:48:02 +00:00
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
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
578c631154
am 5a289ed2: Revert "Revert "Revert "Use mclinker"""
...
* commit '5a289ed29345e545742bc33728d7010b5e2c1e65':
Revert "Revert "Revert "Use mclinker"""
2014-07-24 20:01:01 +00:00
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
9ac0f0838b
Import translations. DO NOT MERGE
...
Change-Id: Id8eadce808d946a7674f41826ab4aa086ac818e7
Auto-generated-cl: translation import
2014-07-24 09:40:19 -07:00
1da4385493
Merge "Use fragment for multi lingual preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
6b71530017
Use fragment for multi lingual preference screen
...
Bug: 16522808
Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
2014-07-28 17:20:16 +09:00
6d7a08107c
Merge "Fix a verifier error on ICS." into lmp-dev
2014-07-24 16:04:26 +00:00
da70b90aa7
Fix a verifier error on ICS.
...
Bug: 16530557
Change-Id: I271c5884995a1d5f8a1cb7aee6f52d17fabb9e72
2014-07-28 17:33:52 +09:00
825243bfdd
Merge "Add BufferWithExtendablebufferTest" into lmp-dev
2014-07-24 15:37:54 +00:00
d4c9d50ef0
Add BufferWithExtendablebufferTest
...
Bug: 13754552
Change-Id: Ib9c330dc85bdb5d4d3d5bc15cc3ce5f28faa0b12
2014-07-25 07:02:10 +09:00
ff6ca09905
Add BufferWithExtendableBuffer::extend()
...
Bug: 14425059
Change-Id: I13dd8412ba4d16a1325ac2210b3852d580e71ad3
2014-07-25 07:02:05 +09:00
dfbe2a8ca8
Merge "Add BufferWithExtendableBuffer::extend()" into lmp-dev
2014-07-24 15:35:58 +00:00
f78eb27c7e
Merge "Refactoring checkAndPrepareWriting." into lmp-dev
2014-07-24 15:35:58 +00:00
5a289ed293
Revert "Revert "Revert "Use mclinker"""
...
This reverts commit b48c93b3fc
2014-07-23 19:58:17 -07:00
6810e8df1e
Refactoring checkAndPrepareWriting.
...
Bug: 14425059
Change-Id: I98940f3841a6c61b0482440b4da21f415dc843f6
2014-07-24 10:24:42 +09:00
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
159474f2ae
Merge "Use default compiler flags for dicttool."
2014-07-23 18:45:08 +00:00
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
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
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
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
Tadashi G. Takaoka
Jean Chalard
Baligh Uddin
Keisuke Kuroyanagi
Tim Murray
Stephen Hines