Baligh Uddin
2a396adc73
am 1006728c
: (-s ours) am eb26838a
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1006728c9c142eba756383cc5f99cb5a5d3d4bd2':
Import translations. DO NOT MERGE
2013-03-07 09:36:37 -08:00
Satoshi Kataoka
505c418dbf
am d48c2117
: am f4425aaa
: Refactor ProximityType and CorrectionType
...
* commit 'd48c2117d0753ee21e9f6a14702dc8ec2fc4c408':
Refactor ProximityType and CorrectionType
2013-03-07 09:36:36 -08:00
Baligh Uddin
1006728c9c
am eb26838a
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit 'eb26838afad3c384da53dd2150d81c3b22403433':
Import translations. DO NOT MERGE
2013-03-07 17:34:30 +00:00
Satoshi Kataoka
d48c2117d0
am f4425aaa
: Refactor ProximityType and CorrectionType
...
* commit 'f4425aaae971fe78d44530ebe01cf7a59b2e47aa':
Refactor ProximityType and CorrectionType
2013-03-07 17:34:29 +00:00
Baligh Uddin
adfa9b9a94
Import translations. DO NOT MERGE
...
Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea
Auto-generated-cl: translation import
2013-03-07 15:05:01 +00:00
Baligh Uddin
8a60ae01d3
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-07 05:27:29 +00:00
Baligh Uddin
eb26838afa
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-07 05:26:16 +00:00
Satoshi Kataoka
f4425aaae9
Refactor ProximityType and CorrectionType
...
Bug: 8277656
Change-Id: Ia7940bbf81fcf4ff5eb7869b105d98aa34155d33
2013-03-07 13:23:02 +09:00
Tom Ouyang
6f1388571f
am 951272d2
: am 2192d08b
: Remove unused scale parameter from getPointToKeyLength()
...
* commit '951272d24aa2ec188c1cdcfdbd1a2afc8edf2d3f':
Remove unused scale parameter from getPointToKeyLength()
2013-03-06 18:46:45 -08:00
Tom Ouyang
951272d24a
am 2192d08b
: Remove unused scale parameter from getPointToKeyLength()
...
* commit '2192d08b9cca6a40d834d6a5001d19b5845ed8a0':
Remove unused scale parameter from getPointToKeyLength()
2013-03-07 02:45:12 +00:00
Tom Ouyang
2192d08b9c
Remove unused scale parameter from getPointToKeyLength()
...
Change-Id: I7bbe1b68264a389923f8a19bb37646c8ab0cb46f
2013-03-06 18:30:43 -08:00
Kurt Partridge
26df5201cc
am 41c471d9
: Merge "[FileEncap5] Move conditional logic to caller"
...
* commit '41c471d93d117a65a4f241e588154d84709cf5d0':
[FileEncap5] Move conditional logic to caller
2013-03-06 13:00:05 -08:00
Kurt Partridge
41c471d93d
Merge "[FileEncap5] Move conditional logic to caller"
2013-03-06 20:59:04 +00:00
Baligh Uddin
bc53c95720
Import translations. DO NOT MERGE
...
Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38
Auto-generated-cl: translation import
2013-03-06 12:44:50 -08:00
Baligh Uddin
73dad2ad41
Import translations. DO NOT MERGE
...
Change-Id: I7cc086bac4494d1238ef6c5f9939a651100ee42d
Auto-generated-cl: translation import
2013-03-06 12:43:53 -08:00
Kurt Partridge
be4e180fab
am 1bc20700
: Merge "[FileEncap4] Simplify logic"
...
* commit '1bc20700d594af28bb87575df4279b0bed624c52':
[FileEncap4] Simplify logic
2013-03-06 12:06:44 -08:00
Kurt Partridge
1bc20700d5
Merge "[FileEncap4] Simplify logic"
2013-03-06 20:05:47 +00:00
Kurt Partridge
0d4c792316
am 719bb3aa
: Merge "[FileEncap3] Extract isUploadingUnconditionally method"
...
* commit '719bb3aa39c6456b7d672258432d18ad917ba263':
[FileEncap3] Extract isUploadingUnconditionally method
2013-03-06 11:16:00 -08:00
Kurt Partridge
719bb3aa39
Merge "[FileEncap3] Extract isUploadingUnconditionally method"
2013-03-06 19:14:52 +00:00
Kurt Partridge
dd5055862f
am 5e5b6b78
: Merge "[FileEncap2] Remove mCanUpload instance variable"
...
* commit '5e5b6b78709b055ac5ed71153c0a696c63201a38':
[FileEncap2] Remove mCanUpload instance variable
2013-03-06 10:41:16 -08:00
Kurt Partridge
5e5b6b7870
Merge "[FileEncap2] Remove mCanUpload instance variable"
2013-03-06 18:39:07 +00:00
Kurt Partridge
a537cbf132
am b000e94e
: Merge "[FileEncap1] Extract hasUploadingPermisssions method"
...
* commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3':
[FileEncap1] Extract hasUploadingPermisssions method
2013-03-06 10:05:01 -08:00
Kurt Partridge
b000e94eea
Merge "[FileEncap1] Extract hasUploadingPermisssions method"
2013-03-06 18:02:26 +00:00
Ken Wakasa
b5e65456dc
am 80353652
: am 042020b0
: Make Cyrillic Hard Signs base letters of Soft Signs per cyrillic keyboard layouts
...
* commit '80353652860c88b41715045dabc4db1cadbf3da1':
Make Cyrillic Hard Signs base letters of Soft Signs per cyrillic keyboard layouts
2013-03-06 08:56:30 -08:00
Ken Wakasa
8035365286
am 042020b0
: Make Cyrillic Hard Signs base letters of Soft Signs per cyrillic keyboard layouts
...
* commit '042020b05fc258866acd3bb880491daca8ce559e':
Make Cyrillic Hard Signs base letters of Soft Signs per cyrillic keyboard layouts
2013-03-06 16:53:36 +00:00
Kurt Partridge
9283644c41
[FileEncap5] Move conditional logic to caller
...
Change-Id: I6599539059f86dc8902210d325439c08035b2e2a
2013-03-06 07:19:41 -08:00
Kurt Partridge
88f466678c
[FileEncap4] Simplify logic
...
Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
2013-03-06 07:19:41 -08:00
Kurt Partridge
7f7850d23a
[FileEncap3] Extract isUploadingUnconditionally method
...
- remove isUploadingUnconditionally local variable
Change-Id: I69be8708c1f306568cbb9c5cbefc9e42a87df497
2013-03-06 07:19:41 -08:00
Kurt Partridge
466e665b3c
[FileEncap2] Remove mCanUpload instance variable
...
Change-Id: I62a100c4d73bb64a14a7994f7dd9af7b6946d064
2013-03-06 07:19:41 -08:00
Kurt Partridge
347b2ebebf
[FileEncap1] Extract hasUploadingPermisssions method
...
Change-Id: Ica1dabcf066cde6580035f12fa35a404cb32fb3f
2013-03-06 07:19:41 -08:00
Kurt Partridge
837e1f7fe7
am 68b3e4e7
: Merge changes I2ded3d0a,I27ad9dfb
...
* commit '68b3e4e7d3ad6d242915d7c087664be5889cfe9b':
Little cleanups
Clean up initialization ordering
2013-03-06 07:09:52 -08:00
Kurt Partridge
68b3e4e7d3
Merge changes I2ded3d0a,I27ad9dfb
...
* changes:
Little cleanups
Clean up initialization ordering
2013-03-06 15:08:08 +00:00
Kurt Partridge
6f68f3da31
am dc89d76f
: Merge "Make some methods visible for testing"
...
* commit 'dc89d76f6b94991be42e42336afa1e9c26ab9e94':
Make some methods visible for testing
2013-03-05 19:46:02 -08:00
Kurt Partridge
dc89d76f6b
Merge "Make some methods visible for testing"
2013-03-06 03:43:55 +00:00
Kurt Partridge
25343124dd
Make some methods visible for testing
...
bug: 8302967
multi-project commit with Icf915abb57ef00840ee93b67a25db42ba51f1c38
Change-Id: I105bda5bdff871508140fb99487dddbf17992790
2013-03-05 19:28:31 -08:00
Kurt Partridge
84bc16af3e
Little cleanups
...
Change-Id: I2ded3d0a29610941fac27c9b26168dd6c06ceccc
2013-03-05 18:37:44 -08:00
Kurt Partridge
4eeb90cd72
Clean up initialization ordering
...
This change is based on an earlier one that got stuck in Gerrit: Iab77504b
Change-Id: I27ad9dfb1bbb2300bd1e61d881a6ea0e116db066
2013-03-05 18:37:00 -08:00
Kurt Partridge
149b2edb90
am 60f51684
: Merge "Clean up logic in onUserLoggingConsent"
...
* commit '60f51684f17da17974602008441e9c927ac116d8':
Clean up logic in onUserLoggingConsent
2013-03-05 08:44:25 -08:00
Kurt Partridge
60f51684f1
Merge "Clean up logic in onUserLoggingConsent"
2013-03-05 16:43:08 +00:00
Ken Wakasa
042020b05f
Make Cyrillic Hard Signs base letters of Soft Signs per cyrillic
...
keyboard layouts
bug: 8269407
Change-Id: I52962ef1b6cbec125f6cfd3afc110fcbb06409df
2013-03-05 20:09:02 +09:00
Tadashi G. Takaoka
97151f1a39
am 249c8870
: am 84fa8043
: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
...
* commit '249c887008272b9f9f01bad8ae83c204eceba6f3':
Add show setup wizard icon preference settings
2013-03-04 22:32:43 -08:00
Tadashi G. Takaoka
249c887008
am 84fa8043
: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
...
* commit '84fa8043e6bef47378b3fc32c277e33034d5c174':
Add show setup wizard icon preference settings
2013-03-05 06:30:33 +00:00
Satoshi Kataoka
6094388f0f
am ff745e9a
: am 830ba674
: refactor MAX_POINT_TO_KEY_LENGTH
...
* commit 'ff745e9a8adef082859dfbfa3ceeb16a0842980b':
refactor MAX_POINT_TO_KEY_LENGTH
2013-03-04 22:24:48 -08:00
Tadashi G. Takaoka
84fa8043e6
Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
2013-03-05 06:23:38 +00:00
Satoshi Kataoka
ff745e9a8a
am 830ba674
: refactor MAX_POINT_TO_KEY_LENGTH
...
* commit '830ba67498c6da53b38212dd9ac5ba318a00de11':
refactor MAX_POINT_TO_KEY_LENGTH
2013-03-05 06:22:53 +00:00
Satoshi Kataoka
830ba67498
refactor MAX_POINT_TO_KEY_LENGTH
...
Change-Id: I3b44068bce784531516f3cdfe67b3b46b1f1b805
2013-03-05 15:10:09 +09:00
Tadashi G. Takaoka
2e1b55f796
Add show setup wizard icon preference settings
...
Bug: 8239067
Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
2013-03-05 14:56:41 +09:00
Kurt Partridge
a5857b3167
am 75e6fb68
: Clean up PREF_USABILITY_STUDY_MODE
...
* commit '75e6fb68e91b440707b399b22fbcfcd67760a949':
Clean up PREF_USABILITY_STUDY_MODE
2013-03-04 15:15:48 -08:00
Kurt Partridge
157c00145b
Clean up logic in onUserLoggingConsent
...
- Make ResearchSetting for whether the user has seen the splash screen
- Inline #setLoggingAllowed, which is short and is now only called by
onUserLoggingConsent
Change-Id: Icdf4592777b80643807b6ccf1d3896459c503e02
2013-03-04 12:05:03 -08:00
Kurt Partridge
75e6fb68e9
Clean up PREF_USABILITY_STUDY_MODE
...
- Refer to a common default value in DebugSettings
- Make PREF_USABILITY_STUDY_MODE independent of the ResearchLogger
- ResearchLogger uses its own preference through ResearchSettings
multi-project commit with Ie0df836c9d779eba484b522666ec357f4e234823
Change-Id: I88547a2f619db6e7364abbbec12f9f76855dd11a
2013-03-04 12:05:03 -08:00