Commit graph

38001 commits

Author SHA1 Message Date
Jatin Matani
55d9651929 Merge "Turn off cloud sync if we have managed profiles" 2015-03-02 20:21:29 +00:00
Jatin Matani
854edce6dd Turn off cloud sync if we have managed profiles
UserManager#getUserProfiles > 1 implies managed
profile.

Workflow:
- Disable sync prefs
- Execute an async task to check for managed profile; if
  managed profile is found, remove the sync prefs. If not, enable
  the preference;
- Move the logging pref from Advanced to Account & Privacy.

Bug:19230544
Change-Id: I4dbd1fe8433b3263ccc74c35dc0ee0bb371122b3
2015-03-02 12:03:57 -08:00
The Android Automerger
20e28741f9 merge in ub-latinimegoogle-fava-release history after reset to jb-ub-latinimegoogle 2015-03-02 19:00:25 +00:00
Geoff Mendal
740f8d7224 Import translations. DO NOT MERGE
Change-Id: I95888bc0f4841f69b8c5cba881f92311c607347f
Auto-generated-cl: translation import
2015-03-02 10:03:04 -08:00
Geoff Mendal
27f1c79cf5 Import translations. DO NOT MERGE
Change-Id: I13b83c06aeb29a65f2eeea28415b041b654e48b6
Auto-generated-cl: translation import
2015-03-02 10:02:21 -08:00
Jatin Matani
d3b6619d9c am 8b290806: Fix build breakage due to changed resource Id
* commit '8b2908066dc5259870fbf210e0af7eeb01d2b1ef':
  Fix build breakage due to changed resource Id
2015-03-02 17:48:29 +00:00
Jatin Matani
8b2908066d Fix build breakage due to changed resource Id
Change-Id: I09ba038930416d1261ef095ec503f1ac68cd92ea
2015-03-02 09:44:19 -08:00
Geoff Mendal
20abab6a24 am 1312b216: (-s ours) Merge "Revert "Import translations. DO NOT MERGE""
* commit '1312b216a8b0fd882b380f1caf6e0f2ed38ef7a8':
  Revert "Import translations. DO NOT MERGE"
2015-03-02 15:36:39 +00:00
Geoff Mendal
1312b216a8 Merge "Revert "Import translations. DO NOT MERGE"" 2015-03-02 15:30:38 +00:00
Geoff Mendal
dd09e82f64 Revert "Import translations. DO NOT MERGE"
This reverts commit 7989b88833.

Change-Id: Ie0fb3fef89938938da661c030808b1d8110816c9
2015-03-02 15:30:10 +00:00
Geoff Mendal
8a6980828b Merge "Revert "Import translations. DO NOT MERGE"" into jb-ub-latinimegoogle 2015-03-02 15:21:02 +00:00
Geoff Mendal
6504e6135f Revert "Import translations. DO NOT MERGE"
This reverts commit 2f0fcc1e30.

Change-Id: I2d96e769a55a6f95888cb6cd86a185c86555ad83
2015-03-02 15:20:52 +00:00
Geoff Mendal
65ed566803 am 3d821600: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '3d8216000258dd72fd507d17790c02f2d0c78ec1':
  Import translations. DO NOT MERGE
2015-03-02 15:14:43 +00:00
Geoff Mendal
69c827d182 am a9de6f58: (-s ours) Import translations. DO NOT MERGE
* commit 'a9de6f589fdb3e0a244ddcd063fb7e86d1688e71':
  Import translations. DO NOT MERGE
2015-03-02 15:14:41 +00:00
Geoff Mendal
3d82160002 Merge "Import translations. DO NOT MERGE" 2015-03-02 15:10:59 +00:00
Geoff Mendal
e0ab979f0a Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2015-03-02 15:07:41 +00:00
Geoff Mendal
7989b88833 Import translations. DO NOT MERGE
Change-Id: I891a5bfa2cfebb4852ba0a1277cf7ae1aec912ae
Auto-generated-cl: translation import
2015-03-02 06:42:15 -08:00
Geoff Mendal
a9de6f589f Import translations. DO NOT MERGE
Change-Id: I4cab7c63e46cfef30b344658d8af54e9e0247752
Auto-generated-cl: translation import
2015-03-02 06:41:33 -08:00
Geoff Mendal
2f0fcc1e30 Import translations. DO NOT MERGE
Change-Id: I0cc15dd7b0ad8c710df0c33325a37899d1bd6810
Auto-generated-cl: translation import
2015-03-02 06:37:25 -08:00
Geoff Mendal
cceb4c71a7 Import translations. DO NOT MERGE
Change-Id: I675c2cc5bdc246498b5b96058bc528f96ceee071
Auto-generated-cl: translation import
2015-03-02 06:36:42 -08:00
Dan Zivkovic
a3b7ff254d am 9770336a: Merge "Label empty suggestions."
* commit '9770336a9b9b65fc62bde6f361e90909d4259769':
  Label empty suggestions.
2015-02-27 21:36:56 +00:00
Dan Zivkovic
9770336a9b Merge "Label empty suggestions." 2015-02-27 21:33:02 +00:00
Chieu Nguyen
33fdb46b5e am 98886775: Merge "Handle double space inserting a period."
* commit '98886775cfb95dc7f6ab50653215373b94b13941':
  Handle double space inserting a period.
2015-02-27 21:27:32 +00:00
Chieu Nguyen
98886775cf Merge "Handle double space inserting a period." 2015-02-27 21:24:36 +00:00
Chieu Nguyen
fdf3cc41ee Handle double space inserting a period.
Change-Id: I109f0e9cf3e972bf60aa3fbbe817337aef70ea3c
2015-02-27 13:19:21 -08:00
Mohammadinamul Sheik
35a9bdbee8 am 62cbaba7: Merge "Update the MAX supported file version for downloaded static Dictionaries."
* commit '62cbaba715878ea31811d4fc7300741510931f6d':
  Update the MAX supported file version for downloaded static Dictionaries.
2015-02-27 21:18:30 +00:00
Mohammadinamul Sheik
62cbaba715 Merge "Update the MAX supported file version for downloaded static Dictionaries." 2015-02-27 21:09:04 +00:00
Dan Zivkovic
24c275ccb9 Label empty suggestions.
When talkback is enabled, empty strings will have a content description.

Bug 19479836.

Change-Id: I25679a2bdeff238a5330ba406d5bc7e6e2868ba1
2015-02-27 12:44:28 -08:00
Dan Zivkovic
29de00a52d am 69c04cad: Race condition in cursor move.
* commit '69c04cadc7c017f9de53f13ea045347b80316d4a':
  Race condition in cursor move.
2015-02-27 18:36:42 +00:00
Mohammadinamul Sheik
377ba98b75 Update the MAX supported file version for downloaded static Dictionaries.
Change-Id: I72d37cc21585b18f4a41ff32627024502f10e993
2015-02-27 10:30:23 -08:00
Dan Zivkovic
69c04cadc7 Race condition in cursor move.
The method WordComposer.moveCursorByAndReturnIfInsideComposingWord() iterates
through all the code points in the word that's currently being composed, and
it tries to adjust the cursor position by a given amount (left or right).
It copies the code points to a new array while processing. But the code point
count comes from a member variable. If the member variable changes while the
method is processing the copy of the code points, it can run over the length
of the code point array.

Bug 18876474.

Change-Id: Ib3a2d90a4e82b76d381efa774e6b3d6bca99c869
2015-02-27 10:29:47 -08:00
Geoff Mendal
7d5cbb611e am 8472b368: (-s ours) am d3c5d3f5: (-s ours) am 3d6f7812: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '8472b36886c1b94ad308cc3479acb2215ac44318':
  Import translations. DO NOT MERGE
2015-02-27 16:53:22 +00:00
Geoff Mendal
0e77a5c2db am ebcac0aa: (-s ours) am 45880656: (-s ours) am 189be54f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'ebcac0aa5992ade0bb3598872ca6f6ddba1d1768':
  Import translations. DO NOT MERGE
2015-02-27 16:53:20 +00:00
Geoff Mendal
9d2229b9ba am 311c99b4: (-s ours) am 22de9d07: (-s ours) am aef36570: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '311c99b4868c10cb4f2c7f9130990d271c0bf8ec':
  Import translations. DO NOT MERGE
2015-02-27 16:53:19 +00:00
Geoff Mendal
b25977ed74 am 0e5a4332: (-s ours) am 0a12c0d8: (-s ours) am e245b27a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '0e5a4332fad16682a0c3dec829e0bc899b8cb635':
  Import translations. DO NOT MERGE
2015-02-27 16:53:17 +00:00
Geoff Mendal
066c2e0bff am c36c95df: (-s ours) am fbe720eb: (-s ours) am 7fb3e8b4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'c36c95df8b253eb742ea7f265b6014545780b764':
  Import translations. DO NOT MERGE
2015-02-27 16:53:15 +00:00
Geoff Mendal
81c667b122 am b86f234a: (-s ours) am 5e3c2854: (-s ours) am aa70f60b: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'b86f234a51c7e642cc4fa392d375914a6220de0a':
  Import translations. DO NOT MERGE
2015-02-27 16:53:13 +00:00
Geoff Mendal
88b21dbe25 am 70c949f0: (-s ours) am b877d706: (-s ours) am 6b1a6c10: (-s ours) Import translations. DO NOT MERGE
* commit '70c949f0623edd2d9ef1b50a6978e9b1b2688b77':
  Import translations. DO NOT MERGE
2015-02-27 16:53:12 +00:00
Geoff Mendal
8472b36886 am d3c5d3f5: (-s ours) am 3d6f7812: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'd3c5d3f59450fe907ccdb79a43e7b5d1096507e8':
  Import translations. DO NOT MERGE
2015-02-27 16:46:58 +00:00
Geoff Mendal
ebcac0aa59 am 45880656: (-s ours) am 189be54f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '4588065664a5791225affef44af12eb53a5f7e31':
  Import translations. DO NOT MERGE
2015-02-27 16:46:56 +00:00
Geoff Mendal
311c99b486 am 22de9d07: (-s ours) am aef36570: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '22de9d079e39d24a9ec8419017783c1b2b2aee41':
  Import translations. DO NOT MERGE
2015-02-27 16:46:55 +00:00
Geoff Mendal
0e5a4332fa am 0a12c0d8: (-s ours) am e245b27a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '0a12c0d82a3364c5d5413ae4dae179805496cd04':
  Import translations. DO NOT MERGE
2015-02-27 16:46:54 +00:00
Geoff Mendal
c36c95df8b am fbe720eb: (-s ours) am 7fb3e8b4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'fbe720eb9f4f51b0e5c5bcb330bb8c393d0bb9a2':
  Import translations. DO NOT MERGE
2015-02-27 16:46:53 +00:00
Geoff Mendal
b86f234a51 am 5e3c2854: (-s ours) am aa70f60b: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '5e3c285436e718610385b058625492768496474a':
  Import translations. DO NOT MERGE
2015-02-27 16:46:51 +00:00
Geoff Mendal
70c949f062 am b877d706: (-s ours) am 6b1a6c10: (-s ours) Import translations. DO NOT MERGE
* commit 'b877d7066b0af3d6c5f200b9563694256e624525':
  Import translations. DO NOT MERGE
2015-02-27 16:46:50 +00:00
Geoff Mendal
d3c5d3f594 am 3d6f7812: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '3d6f78121b50f587546ea8dd6830d1f2e96fd5c4':
  Import translations. DO NOT MERGE
2015-02-27 16:34:29 +00:00
Geoff Mendal
4588065664 am 189be54f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '189be54f693a5e5b68bafcea70e86f9b832d3e59':
  Import translations. DO NOT MERGE
2015-02-27 16:34:27 +00:00
Geoff Mendal
22de9d079e am aef36570: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'aef36570d23d03eaaa891e12ee7ebbf1c07736df':
  Import translations. DO NOT MERGE
2015-02-27 16:34:26 +00:00
Geoff Mendal
0a12c0d82a am e245b27a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'e245b27a4e520c900c79c2fe2c8a163b725ed83d':
  Import translations. DO NOT MERGE
2015-02-27 16:34:25 +00:00
Geoff Mendal
fbe720eb9f am 7fb3e8b4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '7fb3e8b488c7f271c9a18966774321095f10aa5d':
  Import translations. DO NOT MERGE
2015-02-27 16:34:24 +00:00