Commit Graph

12838 Commits

Author SHA1 Message Date
Sara Kato
89abdcac9e Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev am: 9498153dfd
am: ddd0ab8333

Change-Id: I9e17466384348b7a1720edc42c06e34ce8dd880f
2019-04-22 20:29:39 -07:00
Sara Kato
ddd0ab8333 Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev
am: 9498153dfd

Change-Id: I5ff7a8c6e5130c6e5c38cfb181c17a2093eef5a3
2019-04-22 19:17:05 -07:00
Sara Kato
9498153dfd Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev 2019-04-23 01:28:23 +00:00
Felipe Leme
2d137edf28 Merge "Fixed content capture whitelist for specific activities." into qt-dev
am: 845d5ee587

Change-Id: I7b4817d097067667e518ad8e58bd2ed5f17c2b8d
2019-04-22 16:24:14 -07:00
TreeHugger Robot
845d5ee587 Merge "Fixed content capture whitelist for specific activities." into qt-dev 2019-04-22 22:34:09 +00:00
Felipe Leme
a0544899f0 Merge "Minor javadoc fixes." 2019-04-22 18:21:07 +00:00
Felipe Leme
ca5e0a6e2f Merge "Fixed content capture whitelist for specific activities." 2019-04-22 16:10:56 +00:00
Tony Mak
5e92176733 Merge "Move locale from LanguageDetectionEvent to base class" into qt-dev am: 4354101749
am: 6c63b67419

Change-Id: Iaf446ebedce6c9f0d1f0932be08e33ba623b5bcc
2019-04-21 02:34:50 -07:00
Tony Mak
6c63b67419 Merge "Move locale from LanguageDetectionEvent to base class" into qt-dev
am: 4354101749

Change-Id: I6fe6ecbe536cdf4bbc391ca8153caf43dc173db4
2019-04-21 02:22:27 -07:00
TreeHugger Robot
4354101749 Merge "Move locale from LanguageDetectionEvent to base class" into qt-dev 2019-04-21 09:02:26 +00:00
Felipe Leme
cbf7f26baa Fixed content capture whitelist for specific activities.
Test: manual verification (it cannot be fully verified using the current CTS setup)
Test: atest CtsContentCaptureServiceTestCases:android.contentcaptureservice.cts.WhitelistTest
Test: atest FrameworksCoreTests:android.content.ContentCaptureOptionsTest
Test: atest CtsContentCaptureServiceTestCases # sanity check
Test: m update-api

Fixes: 130573023
Merged-In: I2c76a01bd98c4154c4c59099f1368232d2dba80d
Change-Id: I2c76a01bd98c4154c4c59099f1368232d2dba80d
2019-04-19 20:25:45 -07:00
Felipe Leme
41e9eb0aed Fixed content capture whitelist for specific activities.
Test: manual verification (it cannot be fully verified using the current CTS setup)
Test: atest CtsContentCaptureServiceTestCases:android.contentcaptureservice.cts.WhitelistTest
Test: atest FrameworksCoreTests:android.content.ContentCaptureOptionsTest
Test: atest CtsContentCaptureServiceTestCases # sanity check
Test: m update-api

Fixes: 130573023
Change-Id: I2c76a01bd98c4154c4c59099f1368232d2dba80d
2019-04-19 19:47:36 -07:00
Felipe Leme
aeb4ddaa07 Merge "DO NOT MERGE - Updated some javadocs." into qt-dev
am: 2cccdd6b84

Change-Id: I0fbdf2a3a8aae8fa12424f97bef6bbcebd895a07
2019-04-19 18:36:07 -07:00
Felipe Leme
8c2360b123 DO NOT MERGE - Updated some javadocs.
Test: make ds-docs

Bug: 130726495
Fixes: 130737893

Change-Id: Idaf50cb17b0668f3052d86f256d5428ba4e06a3c
2019-04-19 16:08:48 -07:00
Felipe Leme
052c9423d8 Minor javadoc fixes.
Test: echo 'In TH we trust!'
Bug: me not

Change-Id: I8a219fe2b1cbb4f29671fcd0d057f0b81dd7ce82
2019-04-19 16:05:20 -07:00
Felipe Leme
4e574efe28 Temporarily hide some APIs.
Test: m update-api ds-docs
Test: atest CtsContentCaptureServiceTestCases

Bug: 130726495

Change-Id: I3b74c1370f6b6b102e440b65c4cdf6f225296856
2019-04-19 15:41:34 -07:00
Sara Kato
0fdbae3c46 Add @Nullable annotation to getAccessibilityWindowId
Bug: 126701062
Test: None
Change-Id: I7d13d56f5ffb303431f7e82418134d6f17275ef5
2019-04-19 12:04:51 +00:00
Daichi Hirono
f52a2e2451 Merge "Add a flag to cancelDragAndDrop to skip animation" into qt-dev am: 84f4980bc2
am: 71bb63f5f3

Change-Id: I30a00ed988946f91c6fb808237949b8fa3b5c712
2019-04-18 23:45:30 -07:00
Daichi Hirono
71bb63f5f3 Merge "Add a flag to cancelDragAndDrop to skip animation" into qt-dev
am: 84f4980bc2

Change-Id: I0659b19c731f44d0479566de5174fb14cbd56b3f
2019-04-18 23:27:20 -07:00
Daichi Hirono
3e9d510586 Add a flag to cancelDragAndDrop to skip animation
When running cancel animation for drag shadow image, the system cannot
start another drag operation, which is problematic when the system would
start the other drag operation quickly.

Bug: 130313958
Test: Cancel drag operation by calling cancelDragAndDrop
Change-Id: I5d6650a0ce9a4cd80bbdb1beabc9e514349ccadc
2019-04-19 02:30:06 +00:00
Nader Jawad
b59a3549ef Merge "Added BlendMode equivalent APIs to replace deprecated PorterDuff variants" into qt-dev
am: 5c5ffcbd7a

Change-Id: I14bdd95afdc7c329e818cd9507c8138124bd2c88
2019-04-18 14:42:11 -07:00
Nader Jawad
5c5ffcbd7a Merge "Added BlendMode equivalent APIs to replace deprecated PorterDuff variants" into qt-dev 2019-04-18 21:18:32 +00:00
Adrian Roos
163ebddd1a Merge "Ensure Contrast: Address API feedback" into qt-dev am: 2631fb58b6
am: 0ab3251b57

Change-Id: I98492f636ba4f08a59b72a4ba8754082ac4850f5
2019-04-18 04:57:35 -07:00
Adrian Roos
0ab3251b57 Merge "Ensure Contrast: Address API feedback" into qt-dev
am: 2631fb58b6

Change-Id: Id8bd100b89fca6b23c74d7139c6ab48b9e7b96a1
2019-04-18 04:44:13 -07:00
Tony Mak
c30a91702d Move locale from LanguageDetectionEvent to base class
A follow up change of ag/7058048.

Also fixed a wrong nullability annotation, ConversationActions.getHints
should be @NonNull.

Bug: 129344540
Test: atest cts/tests/tests/view/src/android/view/textclassifier/cts/

Change-Id: Iae734b4b27dd3dd8294684330bec198072693a57
2019-04-18 10:25:25 +01:00
Nader Jawad
531db61ac1 Added BlendMode equivalent APIs to replace deprecated PorterDuff
variants

Updated various framework Views to have equivalent BlendMode APIs
to replace the deprecated PorterDuff equivalents.
Updated InspectableProperty annotations to refer to the same
xml attributes as the original tintmode APIs

Bug: 126726419
Test: Added CTS tests to verify new BlendMode APIs
Change-Id: Id9ab36d3d4d29f351250723e9d13d49bc6062c83
Merged-In: Id9ab36d3d4d29f351250723e9d13d49bc6062c83
2019-04-17 21:11:39 +00:00
Adrian Roos
8c7ca4f5c2 Ensure Contrast: Address API feedback
Fixes: 130647853
Test: make checkapi
Test: atest EnsureBarContrastTest NavigationBarColorTest
Change-Id: Iafbdce8476134df56ea5d15155391b10afc9ce94
2019-04-17 21:36:04 +02:00
Nader Jawad
0933505678 Merge "Added BlendMode equivalent APIs to replace deprecated PorterDuff variants" 2019-04-17 18:06:53 +00:00
Charles Chen
ff5fd061d4 Merge "Revert "Unify context in ViewRoot"" into qt-dev am: 5a2e6040c2
am: b2e3d1aa25

Change-Id: I6f07886b428f62e50fd9da2d0d5b69a6b3bef688
2019-04-17 07:33:29 -07:00
Charles Chen
b2e3d1aa25 Merge "Revert "Unify context in ViewRoot"" into qt-dev
am: 5a2e6040c2

Change-Id: Icc3281cab710b0dfa615a6d7abcafac62cd0466b
2019-04-17 07:10:45 -07:00
Louis Chang
53bbc534ec Merge "Unregister ImeInsetsSourceConsumer when focus lost" into qt-dev am: c1a0fbcec5
am: 27105fb73a

Change-Id: I84c69694d53194fc8679a1eb97f251ec7bd607db
2019-04-17 07:10:36 -07:00
Charles Chen
5a2e6040c2 Merge "Revert "Unify context in ViewRoot"" into qt-dev 2019-04-17 13:45:23 +00:00
Charles Chen
fd85036cc7 Revert "Unify context in ViewRoot"
This reverts commit 44f5215ee8.

Reason for revert: <Make Ime test in SystemDecorationTest failed>
Bug: 130715649

Change-Id: I9afb1d5ee7e7a4f1e7de6fa4c7c3ec5dcc336f08
2019-04-17 13:39:06 +00:00
Louis Chang
27105fb73a Merge "Unregister ImeInsetsSourceConsumer when focus lost" into qt-dev
am: c1a0fbcec5

Change-Id: Idde12e81d4f41ab039823470302e099a3c225f68
2019-04-17 06:22:08 -07:00
TreeHugger Robot
c1a0fbcec5 Merge "Unregister ImeInsetsSourceConsumer when focus lost" into qt-dev 2019-04-17 13:03:28 +00:00
Tony Mak
dfe5552458 Merge "Follow-up CL of ag/6935284, add entities to extras in generateLinks" into qt-dev am: 59ed9a7f27
am: 909bc69433

Change-Id: Ib1ba5115664517bcb49c9329cd01f134e6d96466
2019-04-17 04:04:08 -07:00
Tony Mak
9b4cdaa80f Merge "Doing sublisting after deduplication" into qt-dev am: 143c735ee6
am: d43ead222f

Change-Id: Ia893b1246e86479258c2c479409b93947b0395ff
2019-04-17 03:51:03 -07:00
Tony Mak
909bc69433 Merge "Follow-up CL of ag/6935284, add entities to extras in generateLinks" into qt-dev
am: 59ed9a7f27

Change-Id: I2544e5cc4439cc4344dcff8d435fec1cf9c18831
2019-04-17 03:46:28 -07:00
Tony Mak
d43ead222f Merge "Doing sublisting after deduplication" into qt-dev
am: 143c735ee6

Change-Id: I766154f9831feab0884a58a7ad27606a99f7d299
2019-04-17 03:38:22 -07:00
Tony Mak
90be694fc4 Merge "Split TextClassifierEvent into multiple subclasses" into qt-dev am: 0bf14e4804
am: 389a79c28c

Change-Id: I0c5193ce01bc43fccb48eaf95228501460852819
2019-04-17 03:36:43 -07:00
Tony Mak
389a79c28c Merge "Split TextClassifierEvent into multiple subclasses" into qt-dev
am: 0bf14e4804

Change-Id: I7a83d8a29a85e20789fb30353a4fd97275992f4f
2019-04-17 03:23:23 -07:00
TreeHugger Robot
59ed9a7f27 Merge "Follow-up CL of ag/6935284, add entities to extras in generateLinks" into qt-dev 2019-04-17 10:11:18 +00:00
TreeHugger Robot
143c735ee6 Merge "Doing sublisting after deduplication" into qt-dev 2019-04-17 10:09:38 +00:00
Tony Mak
0bf14e4804 Merge "Split TextClassifierEvent into multiple subclasses" into qt-dev 2019-04-17 10:05:20 +00:00
Charles Chen
31b9de7867 Merge "Unify context in ViewRoot" into qt-dev am: 2569d579a4
am: 0ce542cac4

Change-Id: Ibcd67999814b1c6d916cef41516c7a6331033acf
2019-04-16 23:33:01 -07:00
Felipe Leme
5610059d2d Merge "Fixed AutofillOptions.isAugmentedAutofillEnabled to use the right client." into qt-dev am: 17203cd88b
am: a0129ed980

Change-Id: Iffff4159a18eda1e16e39b0dc0e7531aa8735b26
2019-04-16 23:24:28 -07:00
Adam Powell
bce0cbda5a Merge "Gesture exclusion rects for Window" into qt-dev am: 341ea09831
am: b1cf22ef0a

Change-Id: Ie55a24c2dcaee3402f74581ee77eb6f32b286664
2019-04-16 23:13:46 -07:00
Jacky Kao
19e217a9f8 Merge "Clarify documentation for View#setScreenReaderFocusable" into qt-dev am: fd9a858a40
am: 2b0b849acc

Change-Id: I8f0524a998eaf7b98f481b5fa376a84572d0ac0a
2019-04-16 22:52:59 -07:00
Charles Chen
0ce542cac4 Merge "Unify context in ViewRoot" into qt-dev
am: 2569d579a4

Change-Id: I0e459f6b8e94489dc0e2f133d6c9df2382ebffe2
2019-04-16 21:47:22 -07:00
Felipe Leme
a0129ed980 Merge "Fixed AutofillOptions.isAugmentedAutofillEnabled to use the right client." into qt-dev
am: 17203cd88b

Change-Id: I1698b5b35f7998ad136eb4ea5629a4d1c22d70af
2019-04-16 21:36:03 -07:00