Commit Graph

11164 Commits (c6452f2569448aee841ad70baaa27c660a753aff)

Author SHA1 Message Date
Tadashi G. Takaoka 1ffdaafd83 Add setup wizard launcher icon
The setup wizard icon will be hidden if the Android Keyboard is in
system image.

Bug: 8239067
Change-Id: Ib0c0c9e3a0954512c3e03e42a661cdf86eff0dca
2013-03-01 22:28:00 +09:00
Tadashi G. Takaoka 5c681c17ce Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev 2013-03-01 13:26:26 +00:00
Satoshi Kataoka 697a9d3541 Cleanup getProximityType
Change-Id: I89c5871bbcf0fe3d5f50052e8f64932d8efbce94
2013-03-01 20:22:29 +09:00
Satoshi Kataoka c2acf42ed2 am 61d2e10b: am f06ab499: Merge "rename define" into jb-mr2-dev
* commit '61d2e10bd30050a9e851e5625857c7f17e34e544':
  rename define
2013-03-01 02:40:08 -08:00
Satoshi Kataoka 61d2e10bd3 am f06ab499: Merge "rename define" into jb-mr2-dev
* commit 'f06ab499999ead130660e5bc17324225503994ad':
  rename define
2013-03-01 10:39:02 +00:00
Satoshi Kataoka f06ab49999 Merge "rename define" into jb-mr2-dev 2013-03-01 10:32:40 +00:00
Satoshi Kataoka fd0e93295f rename define
Change-Id: I4767eff187c76541648cc066a88293e46a90f033
2013-03-01 19:05:04 +09:00
Jean Chalard 2768f38ea1 am 31747ba7: am abaf5827: Separate suggestions from SuggestionView
* commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40':
  Separate suggestions from SuggestionView
2013-02-28 21:20:22 -08:00
Jean Chalard 31747ba787 am abaf5827: Separate suggestions from SuggestionView
* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351':
  Separate suggestions from SuggestionView
2013-03-01 05:17:52 +00:00
Jean Chalard abaf5827e7 Separate suggestions from SuggestionView
This is a cleanup change, but it's also necessary for

Bug: 8152758
Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71
2013-02-28 21:03:18 -08:00
Tadashi G. Takaoka 419e3e5261 Add translatable="false" to setup wizard's string resources
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
2013-03-01 13:31:57 +09:00
Kurt Partridge 00ed4704f9 Move UUID preference reading to ResearchSettings.java
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
Satoshi Kataoka b0970fa6b4 am 50705703: am bc218dda: Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
* commit '50705703eda5b61c0fa9d18b8239825636a139f2':
  add a default vaule for getMatchedProximityType
2013-02-28 19:49:01 -08:00
Satoshi Kataoka 50705703ed am bc218dda: Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
* commit 'bc218dda8bd9395be0eec3836ed06fb27ce0968f':
  add a default vaule for getMatchedProximityType
2013-03-01 03:46:11 +00:00
Satoshi Kataoka bc218dda8b Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev 2013-03-01 03:42:08 +00:00
Satoshi Kataoka a406f803bc add a default vaule for getMatchedProximityType
Change-Id: Id940f1226ca493d0a1b82e2810b1882184ef8987
2013-03-01 12:36:35 +09:00
Kurt Partridge bdd52d4480 am 9ba7ad8d: Merge "[TestPrep20] Clean up import statement"
* commit '9ba7ad8d4f399d31251c74f5f5116c8d580500cf':
  [TestPrep20] Clean up import statement
2013-02-28 17:34:14 -08:00
Kurt Partridge 9ba7ad8d4f Merge "[TestPrep20] Clean up import statement" 2013-03-01 01:32:35 +00:00
Tadashi G. Takaoka 14a0018d9d am 100b6ae5: am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
* commit '100b6ae5cadee35720a44c071211a436e7b8c80a':
  Revert "Fix description of setup wizard 1st step"
2013-02-28 14:42:29 -08:00
Tadashi G. Takaoka 5a2f14fd11 am 3ccb97a7: am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
* commit '3ccb97a7cdb2536962d9081da03b473d5df37d16':
  Fix description of setup wizard 1st step
2013-02-28 14:42:28 -08:00
Tadashi G. Takaoka 053ef607fb am 040b442f: am 18e21d58: Remove closing method from KeyboardView
* commit '040b442f3cd4c0a212ef7e2ec0c55541b67ec7ce':
  Remove closing method from KeyboardView
2013-02-28 14:42:27 -08:00
Tadashi G. Takaoka 100b6ae5ca am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
* commit '8ef4774a8614e8b67f995f016d3200ff3fd16e30':
  Revert "Fix description of setup wizard 1st step"
2013-02-28 22:38:26 +00:00
Tadashi G. Takaoka 3ccb97a7cd am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
* commit '3516a1f6ddcb9cc608b2e783143f5f4eded31a1f':
  Fix description of setup wizard 1st step
2013-02-28 22:38:25 +00:00
Tadashi G. Takaoka 040b442f3c am 18e21d58: Remove closing method from KeyboardView
* commit '18e21d58f7c0b5c5c001835c093221c573a841c4':
  Remove closing method from KeyboardView
2013-02-28 22:38:11 +00:00
Kurt Partridge 59912837b3 [TestPrep22] Make variable package-private for testing
Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
2013-02-28 06:45:35 -08:00
Kurt Partridge 5cd50faaca [TestPrep20] Clean up import statement
Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
2013-02-28 06:45:34 -08:00
Tadashi G. Takaoka 8ef4774a86 Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev 2013-02-28 10:28:50 +00:00
Tadashi G. Takaoka e359789593 Revert "Fix description of setup wizard 1st step"
This reverts commit b5f4cac532

Change-Id: Ic5787fcf63663885285c20403534572d5e7d7696
2013-02-28 10:25:42 +00:00
Tadashi G. Takaoka 3516a1f6dd Merge "Fix description of setup wizard 1st step" into jb-mr2-dev 2013-02-28 07:55:53 +00:00
Tadashi G. Takaoka b5f4cac532 Fix description of setup wizard 1st step
Bug: 8265778
Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
2013-02-28 16:55:11 +09:00
Kurt Partridge a5070711d9 am abaa88fd: Merge "[TestPrep18] Make class public for testing"
* commit 'abaa88fd4e33de54f3efd980ac0fef4935e439db':
  [TestPrep18] Make class public for testing
2013-02-27 17:02:59 -08:00
Kurt Partridge abaa88fd4e Merge "[TestPrep18] Make class public for testing" 2013-02-28 01:00:46 +00:00
Kurt Partridge b06798c599 am a04fbce4: Merge "[TestPrep17] Allow fake dictionary for testing"
* commit 'a04fbce41273b0b7d464e4d823de5f0d54549673':
  [TestPrep17] Allow fake dictionary for testing
2013-02-27 16:00:23 -08:00
Kurt Partridge a04fbce412 Merge "[TestPrep17] Allow fake dictionary for testing" 2013-02-27 23:59:01 +00:00
Tadashi G. Takaoka cbf3f2655a am 2ed1ec41: am 016046eb: Keep Keyboard object while closing KeyboardView
* commit '2ed1ec411d8b539890359f8ced8e1fe8d90344cd':
  Keep Keyboard object while closing KeyboardView
2013-02-27 15:27:35 -08:00
Tadashi G. Takaoka 2ed1ec411d am 016046eb: Keep Keyboard object while closing KeyboardView
* commit '016046eb4e3ea28745b9a29c41c126801f177f58':
  Keep Keyboard object while closing KeyboardView
2013-02-27 23:22:32 +00:00
Baligh Uddin 131151220f am 6aaeb7fc: (-s ours) Import translations. DO NOT MERGE
* commit '6aaeb7fc34f98e9f72bfede6624c238d6ff15ccd':
  Import translations. DO NOT MERGE
2013-02-27 13:10:42 -08:00
Baligh Uddin 6aaeb7fc34 Import translations. DO NOT MERGE
Change-Id: Ib43ed30fcf7d9be1d29af9da9dfe148371a3aec7
Auto-generated-cl: translation import
2013-02-27 12:30:44 -08:00
Baligh Uddin 32081df5d8 Import translations. DO NOT MERGE
Change-Id: I14643d519433db75403b8a7f5b9a409e316c1f1e
Auto-generated-cl: translation import
2013-02-27 12:25:14 -08:00
Tadashi G. Takaoka 18e21d58f7 Remove closing method from KeyboardView
This is a follow up of Ie00ba827. After the change, the
KeyboardView.closing() method does nothing important.

Change-Id: I9659ea56ce82a95f8798a4136bf93f164b67fae7
2013-02-27 17:35:20 +09:00
Tadashi G. Takaoka 016046eb4e Keep Keyboard object while closing KeyboardView
Bug: 8217626
Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c
2013-02-27 17:30:16 +09:00
Kurt Partridge d9ca1a3f2c am 424a976e: Merge "Ensure Preference listener is unregistered"
* commit '424a976e58ea40e44f28ac4b6aacc4656a4c1377':
  Ensure Preference listener is unregistered
2013-02-26 19:51:14 -08:00
Kurt Partridge 424a976e58 Merge "Ensure Preference listener is unregistered" 2013-02-27 03:49:40 +00:00
Kurt Partridge 96d019f183 [TestPrep18] Make class public for testing
Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1
2013-02-26 19:22:56 -08:00
Kurt Partridge 5ee261a990 [TestPrep17] Allow fake dictionary for testing
Currently ResearchLog requires a full dictionary to perform privacy-related checks.
This makes testing difficult.  This change allows a fake dictionary to be used instead.

Change-Id: Ifca5bd8647475a6b84e4324117e0faa0a35479ee
2013-02-26 19:22:55 -08:00
Kurt Partridge 7e2c1e69bf Ensure Preference listener is unregistered
Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333
2013-02-26 18:40:34 -08:00
Kurt Partridge 14de0d22ab am 64c34122: Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call"
* commit '64c34122f26f58a621ca9e2f9258ab47d99a1178':
  [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
2013-02-26 16:43:21 -08:00
Kurt Partridge 64c34122f2 Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call" 2013-02-27 00:41:12 +00:00
Tadashi G. Takaoka 2b12faa69b am 16cbc30a: am e621ea5f: Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
* commit '16cbc30ae5c4b3249ff1551c7f5c2e20bd4cd299':
  Fix failed unit test due to resource string change
2013-02-26 16:16:57 -08:00
Tadashi G. Takaoka 16cbc30ae5 am e621ea5f: Merge "Fix failed unit test due to resource string change" into jb-mr2-dev
* commit 'e621ea5fdc4af0034c7c1d41e2d10aefc86e8aab':
  Fix failed unit test due to resource string change
2013-02-27 00:15:25 +00:00