Yohei Yukawa
c8deda50fe
am e564feba: am 4daf600e: Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev
...
* commit 'e564feba53f71610afb3bc995497e853654fb2d6':
Check system locale when picking up an initial SpellChecker.
2015-06-29 21:23:24 +00:00
Yohei Yukawa
4daf600ee0
Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev
2015-06-29 20:42:54 +00:00
Alan Viverette
1537e1358e
am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
...
* commit '4faa4cbbca0c9027aa67063a2ad43f008628c5bb':
Always remeasure ListView scrap used to obtain minimum width
2015-06-29 20:04:39 +00:00
Alan Viverette
a1b647c883
Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
2015-06-29 19:39:29 +00:00
Jae Seo
96c23baff0
am 1d75e527: am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
...
* commit '1d75e5273e63de811363f22976ced24f629918ce':
Use AlertDialog for MediaRouteControllerDialog
2015-06-29 17:25:16 +00:00
Nicolas Prevot
d1d1a70050
am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
...
* commit '64c0c4da555f6d38b9c2516f855b49e6b501b783':
Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
2015-06-29 17:25:10 +00:00
Jae Seo
82b3f67711
Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
2015-06-29 17:14:43 +00:00
Nicolas Prevot
6fd49936ae
Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
2015-06-29 17:08:34 +00:00
Kenny Guy
45dab52ce8
am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev
...
* commit '9aa0c4811097e7754cde0340dfcc32044a7caf7d':
Revert "Deprecate APIs for admin to create users."
2015-06-29 13:58:13 +00:00
Craig Lafayette
8a42356c21
am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev
...
* commit '5c708248c32f1a667ea3d49cf6ace28b5d29afd1':
Hide MIME_TYPE_PROVISIONING_NFC_V2
2015-06-29 13:57:56 +00:00
Kenny Guy
24863e12e5
am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev
...
* commit '2c594b214977221773b447bd4cfefb5187911f10':
Deprecate APIs for admin to create users.
2015-06-29 13:57:50 +00:00
Benjamin Franz
31706d9921
am 635e4ffc: am b6fb3fe8: Merge "Block assist when screenshots are disabled by policy" into mnc-dev
...
* commit '635e4ffcf65bef9cde34a62583ee6dac49cb2592':
Block assist when screenshots are disabled by policy
2015-06-29 13:57:33 +00:00
Kenny Guy
43904fd5b7
Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev
2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11
Revert "Deprecate APIs for admin to create users."
...
This reverts commit ea864c4d4d .
Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69
Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev
2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662
Merge "Deprecate APIs for admin to create users." into mnc-dev
2015-06-29 12:42:21 +00:00
Benjamin Franz
b6fb3fe8f4
Merge "Block assist when screenshots are disabled by policy" into mnc-dev
2015-06-29 10:29:23 +00:00
Niels Egberts
994d33c4be
am 5cf3d76e: am 1ea7a819: Merge "Fix crash with engines that don\'t override getVoices()." into mnc-dev
...
* commit '5cf3d76e98172f8bf2fc02fa5dbf028c07747c60':
Fix crash with engines that don't override getVoices().
2015-06-29 09:56:35 +00:00
Niels Egberts
1ea7a81931
Merge "Fix crash with engines that don't override getVoices()." into mnc-dev
2015-06-29 09:34:44 +00:00
Seigo Nonaka
450343261e
am a7c725f2: am e96b1c6f: Merge "Fix crash due to reverse selection." into mnc-dev
...
* commit 'a7c725f2f3e3b7df1923033555a845bfb6a936f9':
Fix crash due to reverse selection.
2015-06-29 03:25:19 +00:00
Seigo Nonaka
e96b1c6f82
Merge "Fix crash due to reverse selection." into mnc-dev
2015-06-29 03:02:45 +00:00
Christopher Tate
de3d02e4c3
am e436e19e: am b035c6d9: Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev
...
* commit 'e436e19e0f40defcac3265efcc40eb355de06846':
Properly scope the "only http/https schemes" intent filter semantics
2015-06-27 01:05:16 +00:00
Yohei Yukawa
174843afb6
Check system locale when picking up an initial SpellChecker.
...
Since Ia25e7b4f308778891929e31b8cbd741f6848cce4, the TSMS has
picked up the first found spell checker no matter regardless of
the system locale.
The primary goal of this CL is to introduce a low-risk fix for
the situation where two or more spell checker services are
pre-installed but they are well different from each other in
terms of supported languages. Solving the problem in more
ambiguous and complicated situation is beyond the goal of
this CL.
With this CL, we still pick up the first found spell checker
but also require the spell checker supports a certain locale.
We will try several locales starting with the system locale
to some fallback locales until we find one appropriate spell
checker. If no spell checker is picked up in this process,
we simply pick up the first one as we have done.
Examples about what locales will be checked are:
A. System locale: en_US
1. en_US
2. en_GB
3. en
B. System locale: en
1. en
2. en_US
3. en_GB
C. System locale: en_IN
1. en_IN
2. en_US
3. en_GB
4. en
D. System locale: ja_JP
1. ja_JP
2. ja
3. en_US
4. en_GB
5. en
E. System locale: fil_PH
1. fil_PH
2. fil
3. en_US
4. en_GB
5. en
F. System locale: th_TH_TH
1. th_TH_TH
2. th_TH
3. th
4. en_US
5. en_GB
6. en
Bug: 22042994
Change-Id: I094f1c33430f7904a1dac6167431d6df64a07212
2015-06-26 18:02:54 -07:00
Dianne Hackborn
c063f1cf50
am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev
...
* commit '97abd672aaa041c34542d8bbededbe207798baee':
Looks like MNC is gonna be API 23.
2015-06-27 00:54:25 +00:00
Christopher Tate
b035c6d9a6
Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev
2015-06-27 00:48:10 +00:00
Christopher Tate
2134744efd
Properly scope the "only http/https schemes" intent filter semantics
...
That restriction applies only to default-app linkage verification, and
not to any general questions of "is this app effectively a web browser?"
Bug 21688029
Change-Id: I9f6a7bc6dcac5e12ee07f8da6465ad51c1aeddfb
2015-06-26 17:45:22 -07:00
Dianne Hackborn
d5f387bc5f
Merge "Looks like MNC is gonna be API 23." into mnc-dev
2015-06-27 00:29:26 +00:00
Dianne Hackborn
2e5cad7868
Looks like MNC is gonna be API 23.
...
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
2015-06-26 16:15:55 -07:00
Robert Greenwalt
07fae068d3
am b3fcf1af: am ae3584bd: Merge "Add Validation logging." into mnc-dev
...
* commit 'b3fcf1afcb6856182dea8b7ae128f4232473e35c':
Add Validation logging.
2015-06-26 22:55:03 +00:00
Mady Mellor
51673142ae
am 9ebbbf10: am 11b64410: Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev
...
* commit '9ebbbf107077a7de30491fbaa3b4a2ab9b826775':
Text selection: fix snapping to words when words break across lines
2015-06-26 22:54:57 +00:00
Rubin Xu
ba5c07286f
am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
...
* commit 'd1858a7d3e648f6c7382bba5bd3982a7ecc15257':
Use StorageManager.wipeAdoptableDisks to wipe external disks
2015-06-26 22:54:50 +00:00
Abodunrinwa Toki
9508d8738e
am e02ee117: am 1223a75a: Merge "TextView: add the "Share" accessibility action." into mnc-dev
...
* commit 'e02ee117ed14fd76dcbe4ee9d519c15f13d05a9d':
TextView: add the "Share" accessibility action.
2015-06-26 22:54:45 +00:00
Robert Greenwalt
ae3584bd8d
Merge "Add Validation logging." into mnc-dev
2015-06-26 22:40:31 +00:00
Mady Mellor
11b64410d9
Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev
2015-06-26 22:36:44 +00:00
Rubin Xu
0a202eac01
Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev
2015-06-26 22:36:13 +00:00
Abodunrinwa Toki
5d7e2394d3
am 8e1cf18f: am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
...
* commit '8e1cf18fe7e2cda17813cdc4a8131ef997331958':
Fix FloatingToolbar flicker in reaction to text cursor blink.
2015-06-26 22:33:41 +00:00
Chien-Yu Chen
4997948c7c
am c9a7b419: am f09fd213: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
...
* commit 'c9a7b41967beaea497fe24d5d1015546697c8d74':
Camera2: Remove references to sync.frameNumber
2015-06-26 22:33:35 +00:00
Chien-Yu Chen
831c12ffd6
am 51e84e7a: am 58a152e3: Merge "Camera2: Clarify session callbacks" into mnc-dev
...
* commit '51e84e7af830135b3cf1f77df79e21fccbf2cc18':
Camera2: Clarify session callbacks
2015-06-26 22:33:29 +00:00
Abodunrinwa Toki
1223a75a67
Merge "TextView: add the "Share" accessibility action." into mnc-dev
2015-06-26 22:32:26 +00:00
Abodunrinwa Toki
1fa8290dbe
Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev
2015-06-26 22:09:43 +00:00
Chien-Yu Chen
f09fd213c3
Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev
2015-06-26 22:09:37 +00:00
Abodunrinwa Toki
c107b0ecdc
Fix FloatingToolbar flicker in reaction to text cursor blink.
...
1. Reposition the toolbar on predraw only when positioning has changed.
2. Update the toolbar popup's position only if the content rect changed.
3. Fix FloatingToolbarPopup.cancelOverflowAnimations().
The previous implementation wasn't actually cancelling the animation.
(1) is enough to fix the bug. But (2) and (3) fix issues in the
toolbar directly related to this bug.
Bug: 22039189
Change-Id: I84ec793d788f9402a1f8635e68e3344746f6af07
2015-06-26 15:08:26 -07:00
Chien-Yu Chen
58a152e359
Merge "Camera2: Clarify session callbacks" into mnc-dev
2015-06-26 22:05:05 +00:00
Jae Seo
001d51496d
Use AlertDialog for MediaRouteControllerDialog
...
Bug: 19876497, Bug: 21795195, Bug: 22044600
Change-Id: I8ec3b17d026b2690edad4b5c4d61741e29b653db
2015-06-26 14:47:37 -07:00
Mady Mellor
06121b6733
am eb0918f1: am 450176c5: Merge "Fix: Text selection handles shouldn\'t be shown in accessibility mode" into mnc-dev
...
* commit 'eb0918f117bf01e3fb0d52b9b14afea8b0ab9920':
Fix: Text selection handles shouldn't be shown in accessibility mode
2015-06-26 21:39:45 +00:00
George Mount
f337641fa5
am 29711396: am 3ebcd865: Merge "Fix endTransition index out of bounds exception." into mnc-dev
...
* commit '29711396c08aec8cde46f960aa3b3a30d4fde497':
Fix endTransition index out of bounds exception.
2015-06-26 21:39:34 +00:00
George Mount
3c176813a9
am eab5fbc3: am 7a0f54b1: Merge "Fix addTarget not limiting to the given views." into mnc-dev
...
* commit 'eab5fbc390ea331d33a21bcc3622a9fc808586bf':
Fix addTarget not limiting to the given views.
2015-06-26 21:39:28 +00:00
Mady Mellor
a526683d12
Text selection: fix snapping to words when words break across lines
...
Some languages do break words across lines and words can break between
lines with hyphenation. If a word has only one character on the current
line with the rest of the characters on the next line, the user would
be unable to move the cursor to the end of the word.
Rather than judging if a user is far enough into a word by using the
full word length, this CL amends the logic to only use the characters
that are on the current line of the word, if the user is far enough into
these characters the handle jumps to the next line to the end of the
word position.
Bug: 21400624
Change-Id: I8b96eb83bea08d9794d1e9db74066bcc3e168ac0
2015-06-26 14:28:12 -07:00
Jim Miller
7693732cfc
am d3893078: am 63ec93d5: Merge "Have FingerprintService keep the device awake on relevant events." into mnc-dev
...
* commit 'd3893078948efdb70c09495726de4e45cb4f06a3':
Have FingerprintService keep the device awake on relevant events.
2015-06-26 21:27:21 +00:00
Abodunrinwa Toki
0e5c603192
TextView: add the "Share" accessibility action.
...
Bug: 21891817
Change-Id: I99b7489845b2103c18fd74d15d0050c34f37ca67
2015-06-26 14:25:15 -07:00