Commit Graph

13496 Commits

Author SHA1 Message Date
Susi Kharraz-Post
91a2dcbfda Merge "Add sharesheet statsd logging" into rvc-dev am: f9617e33f9 am: 36391620b4 am: 6b548a82ab am: f1c6dd75b0
Change-Id: Ic5b16d2c5128b04c77441565f4589bcc4a22dda5
2020-04-03 14:27:33 +00:00
Susi Kharraz-Post
6b548a82ab Merge "Add sharesheet statsd logging" into rvc-dev am: f9617e33f9 am: 36391620b4
Change-Id: I9150e723ea447209825a0ed9b441fd7725c0fe1c
2020-04-03 13:45:21 +00:00
Susi Kharraz-Post
dde9c3afc8 Add sharesheet statsd logging
Add a Logger for sharesheet and add calls into ChooserActivity.java

Bug: 147508495
Test: manual testing and added unit tests into ChooserActivityTests.
Change-Id: I0024b5020f47475a28c4745af4d8ef268e5f85be
2020-04-03 11:07:19 +00:00
Yohei Yukawa
8b1587346f Merge "Let blocked InputConnection APIs fail upon IInputMethod.unbindInput()" into rvc-dev am: dbe201d2ac am: f7af18e811 am: 5773bbfc54 am: 66ea553dab
Change-Id: I1ccca7df835375c59d226fa4110200ae2e6326ef
2020-04-03 04:05:02 +00:00
Yohei Yukawa
5773bbfc54 Merge "Let blocked InputConnection APIs fail upon IInputMethod.unbindInput()" into rvc-dev am: dbe201d2ac am: f7af18e811
Change-Id: Iae55dc17f374db9987963d9cf9b1f150ddc63031
2020-04-03 02:58:11 +00:00
Yohei Yukawa
f87f750888 Let blocked InputConnection APIs fail upon IInputMethod.unbindInput()
This is a follow up CL to our previous CL [1], which implemented
fail-fast mode for blocking InputConnection APIs based on
IInputMethod.unbindInput() async signal from IMMS to IMS.

What was not implemented in the previous CL was a mechanism to
immediately unblock a sync InputConnection API call that is already
requested to the IME client process and waiting for its response.

With this CL, any blocking InputConnection API fails immediately when
IInputMethod#onUnbindInput() is delivered to the IME process, without
waiting for the full time-out period (MAX_WAIT_TIME_MILLIS == 2 sec)
to pass.

Implementation Note:

The key idea is to use CountDownLatch to compose multiple wait
conditions.composed wait condition. The CountDownLatch is initialized
with 1 then will be decremented when:

 A. received a result from the IME client
 B. received IInputMethod.unbindInput()

Hence InputConnectionWrapper can simply wait for the CountDownLatch to
become 0 with an existing timeout (MAX_WAIT_TIME_MILLIS) then returns
failure unless the CountDownLatch became 0 because of A.

 [1]: I0f816c6ca4c5c0664962432b913f074605fedd27
      1d113d041f

Fix: 36897707
Test: atest InputConnectionBlockingMethodTest
Test: InputConnectionBlockingMethodTest#*FailFastAfterUnbindInput()
      take shorter time to complete.
Test: Monitor logcat with `adb logcat -s InputConnectionWrapper:*`
      while running `atest InputConnectionBlockingMethodTest`
Change-Id: Ic65a95eb5d0fd56f505a02fd9083bcf6694b6734
2020-04-02 12:54:55 -07:00
Feng Cao
f8347366d2 Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev am: 257aa916ac am: 8ab445a7a9 am: 3f185c6881 am: 6c8b4417cc
Change-Id: Iff11cae258441c0adbccc16bf28b2ccc2f61d252
2020-04-02 18:34:58 +00:00
Automerger Merge Worker
17390b4a33 Merge "Merge changes Ia152bc41,Iae8026e7 into rvc-dev am: 71a6d0bf2b am: 9716d62b4d" into rvc-d1-dev-plus-aosp am: aa5088485c am: aef5228d68
Change-Id: I84c387f3c2f7c774c236a5786f5602dc997c3cbe
2020-04-02 17:06:10 +00:00
Feng Cao
3f185c6881 Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev am: 257aa916ac am: 8ab445a7a9
Change-Id: I03b161351e49dae841521f8262d9d48a11ad7e8e
2020-04-02 03:09:53 +00:00
Feng Cao
257aa916ac Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev 2020-04-02 02:47:01 +00:00
Selim Cinek
a5f56c1aad Merge changes Ia152bc41,Iae8026e7 into rvc-dev am: 71a6d0bf2b am: 9716d62b4d
Change-Id: Iab69600a392fcc0ea6f499862a2626a6ed69636e
2020-04-01 21:11:29 +00:00
Feng Cao
59b682f5cd Define custom equals method for bundles in the inline APIs
Test: atest android.view.inputmethod.cts
Bug: 152811052

Change-Id: I15051493bb37f05b579b16d6e7fee36b05ab10cc
2020-04-01 12:46:15 -07:00
Steve Elliott
fec64f3ea3 Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev am: 4605ca9daa am: 33449a1a70 am: f80e65cb74 am: beb03ec62f
Change-Id: I5991caaae30aed03d8ad8dfcf239c2214c690f2d
2020-04-01 18:45:50 +00:00
Selim Cinek
4237e8277a Reintroduced app ops for conversation notifications
Previously app ops weren't showing in conversation notifications
Also made sure that they show in case the app name is long.
Additionally this fixes the coloring of the sender name.

Fixes: 150905003
Test: atest SystemUITests
Change-Id: Iae8026e7efdec8c207d1984dac4ee089abe116b9
2020-04-01 11:40:54 -07:00
Steve Elliott
f80e65cb74 Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev am: 4605ca9daa am: 33449a1a70
Change-Id: I58b798384785d423588389e8365f862e7e630815
2020-04-01 18:11:22 +00:00
Steve Elliott
4605ca9daa Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev
* changes:
  Reinflate notif when [un]marked as conversation
  Update conversation UI when importance changed
  Add unread count badge to conversation layout
2020-04-01 17:34:36 +00:00
Nikita Dubrovsky
4ec7f29691 Merge "Add unified API for inserting rich content (e.g. pasting an image)" 2020-04-01 02:59:15 +00:00
Nikita Dubrovsky
832edc3cc9 Add unified API for inserting rich content (e.g. pasting an image)
The new callback provides a single API that apps can implement to
support the different ways in which rich content may be inserted.

The API is added to TextView and unifies the following code paths:
* paste from the clipboard (TextView.paste)
* content insertion from the IME (InputConnection.commitContent)
* drag and drop (Editor.onDrop)
* autofill (TextView.autofill)

Corresponding API in support lib: aosp/1200800

Bug: 152068298
Test: Manual and unit tests
  atest FrameworksCoreTests:TextViewRichContentReceiverTest
  atest FrameworksCoreTests:AutofillValueTest
  atest FrameworksCoreTests:TextViewActivityTest
Change-Id: I6e03a398ccb6fa5526d0a282fc114f4e80285099
2020-03-31 15:15:36 -07:00
TreeHugger Robot
39ea59c54e Merge "Send more IME events to autofill manager service." into rvc-dev am: cbd80ea094 am: e8a3b8d44b am: 08b0f425b4 am: 838cc61943 am: cc554cbad7
Change-Id: If1d1a481115987e4827fa22d844ad6105d8fb689
2020-03-31 21:59:08 +00:00
Automerger Merge Worker
ccc43f021b Merge "Merge changes I0d79642d,If8756ac8,I29e73897,Ia8c5121a,I533b8f06 into rvc-dev am: 9bad85af2b am: 3bd1a83e56" into rvc-d1-dev-plus-aosp am: 36bf20dfa6 am: 32d792b771
Change-Id: I78dbadac45e51606800c7d65a4dada58c134af8d
2020-03-31 21:51:40 +00:00
TreeHugger Robot
cc554cbad7 Merge "Send more IME events to autofill manager service." into rvc-dev am: cbd80ea094 am: e8a3b8d44b am: 08b0f425b4 am: 838cc61943
Change-Id: I7884801e03c3f7f2273121551fdf297e524a274d
2020-03-31 20:54:32 +00:00
TreeHugger Robot
39ac9712e0 Merge "Send more IME events to autofill manager service." into rvc-dev am: cbd80ea094
Change-Id: I75afaf0697a5b56a2445a9d4e5d19093fee884f6
2020-03-31 20:27:16 +00:00
Selim Cinek
d318667715 Merge changes I0d79642d,If8756ac8,I29e73897,Ia8c5121a,I533b8f06 into rvc-dev am: 9bad85af2b am: 3bd1a83e56
Change-Id: Ife8cc27b7c9be4042b332c45425a43f17dbc6ef2
2020-03-31 20:22:31 +00:00
TreeHugger Robot
cbd80ea094 Merge "Send more IME events to autofill manager service." into rvc-dev 2020-03-31 20:22:28 +00:00
Steve Elliott
239e6cb1df Add unread count badge to conversation layout
Fixes: 152303800
Test: manual, visual
Change-Id: I9308a15ab223086398ba073b08d60cb7c50d8c30
2020-03-31 16:20:39 -04:00
Selim Cinek
7476896ef3 Merge changes I0d79642d,If8756ac8,I29e73897,Ia8c5121a,I533b8f06 into rvc-dev am: 9bad85af2b
Change-Id: Ib0602cec00fb8468fa46cc233cbc141d51871d01
2020-03-31 20:12:57 +00:00
Selim Cinek
9bad85af2b Merge changes I0d79642d,If8756ac8,I29e73897,Ia8c5121a,I533b8f06 into rvc-dev
* changes:
  Indented the conversation action list
  Fixed some issues where conversation badges would not be visible
  Improved the animations of the conversation badges
  Important conversations now also transform into the shelf
  Adapted Shelf algorithm to also use conversation icons
2020-03-31 20:02:01 +00:00
Feng Cao
97ec1c4dcc Send more IME events to autofill manager service.
* In IME side, wait for the input start before calling back to Autofill,
  rather than returning inline unsupported immediately.
* Also adds an InlineSuggestionManager to simplify code in the
  InputMethodService

Test: atest CtsAutoFillServiceTestCases
Test: atest CtsInputMethodTestCases
Bug: 151123764

Change-Id: I199925d77aa508f259e98a8929120aeb96015b57
2020-03-31 18:11:24 +00:00
Benedict Wong
f5c487b52c Merge changes I97ba5903,Icd80b368 into rvc-dev am: 7df7129b40 am: 0a1afc6dbc am: 34417aafed am: 6e31fcc105
Change-Id: I23bd1b785a0b9920c9f2402d92e6b0c00362cf87
2020-03-31 18:02:09 +00:00
Selim Cinek
e027da23c0 Indented the conversation action list
Previously the actions weren't aligned with the conversation content
start.

Bug: 150905003
Test: add conversations, observe normal layout
Change-Id: I0d79642db736c66419ae3e4a6982ebd17abf09e2
2020-03-31 10:42:34 -07:00
Benedict Wong
34417aafed Merge changes I97ba5903,Icd80b368 into rvc-dev am: 7df7129b40 am: 0a1afc6dbc
Change-Id: I7f211c7a4d383523e574c8ce969ee28687a42929
2020-03-31 17:36:58 +00:00
Benedict Wong
7df7129b40 Merge changes I97ba5903,Icd80b368 into rvc-dev
* changes:
  Make VpnProfile.maxMtu default value match Ikev2VpnProfile
  Add negotiated DNS servers to VPN config
2020-03-31 16:52:04 +00:00
Benedict Wong
399c1365c2 Make VpnProfile.maxMtu default value match Ikev2VpnProfile
This change corrects the VpnProfile's maxMtu defaults to match that of
the Ikev2VpnProfile. 1400 is too high as a default, and Settings will
run into an issue here quite often.

Bug: 152573931
Test: FrameworksNetTests passing
Change-Id: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
Merged-In: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
(cherry picked from commit d0a44f49df)
2020-03-30 22:59:17 -07:00
Antoan Angelov
7daf1bb4f6 Merge "Show empty state screens in order of priority." into rvc-dev am: 9238e32a16 am: 571c0e4ea3 am: f6be54216a am: 399abda1fd
Change-Id: Ie7a6a1552fa729977fe06be9679dc6dee8468b25
2020-03-31 05:50:02 +00:00
Benedict Wong
91aa444667 Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 328ef02bf3 am: 1ee1f86749
Change-Id: I51a3ec89f215dd937357e5a77f679a063a7b8a18
2020-03-31 03:06:19 +00:00
TreeHugger Robot
ec1c0d4a21 Merge "Fix flickers when changing control" into rvc-dev am: c322ed2173 am: 162040e358 am: b88c500fea am: 3cb2ddd649 am: 2e5799ae71
Change-Id: I19e3ca9cb45d5e9e058b318fc891d5a5c06859e7
2020-03-30 23:44:23 +00:00
Selim Cinek
9f2d21f3cc Improved the animations of the conversation badges
Previously the badges would just immediately disappear
without an animation. They are now animated when the
icon has finished animating.

Bug: 150905003
Test: add conversations, observe animations
Change-Id: I29e7389732bd5c22953dd7753d0feaae00297db0
2020-03-30 16:18:10 -07:00
Selim Cinek
9ed6e0452c Important conversations now also transform into the shelf
Instead of always using the small icon, important conversations
now transform from the conversationIcon

Bug: 150905003
Test: add a few notification, observe nice transitions
Change-Id: Ia8c5121a6bd415ccca9d959d291665b8ac43b000
2020-03-30 16:18:10 -07:00
Selim Cinek
79d9863ebc Adapted Shelf algorithm to also use conversation icons
Previously the algorithm would only work with a header
and the icon wouldn't transform into the shelf.
This is now fixed.

Bug: 150905003
Test: add conversation notification, observe normal transition
Change-Id: I533b8f06bee29ee93888d748808b4313fef338e8
2020-03-30 16:18:09 -07:00
TreeHugger Robot
770f2b18e5 Merge "Include word "fatal" in zygote death message" 2020-03-30 22:11:52 +00:00
Alex Spradlin
10700dceea Merge "Fix DecorView error about non-visual context" into rvc-dev
Automerger is stuck on this

Change-Id: Ia4cdfbb83787521e8eb32993dc6dd2cb2dbde96b
2020-03-30 20:57:09 +00:00
Antoan Angelov
d15a12fac9 Merge "Show empty state screens in order of priority." into rvc-dev am: 9238e32a16
Change-Id: I8051c316da14d9878658f055e8141f581fff8697
2020-03-30 20:06:27 +00:00
Antoan Angelov
f6be54216a Merge "Show empty state screens in order of priority." into rvc-dev am: 9238e32a16 am: 571c0e4ea3
Change-Id: Ia7f2f0f9f56392dace7e0b12e4bc2c9891e258a6
2020-03-30 20:05:03 +00:00
TreeHugger Robot
444f200f86 Merge "Fix flickers when changing control" into rvc-dev am: c322ed2173 am: 162040e358
Change-Id: Id54a95cfda897b0c88c02959ada4997ec4b69308
2020-03-30 18:58:25 +00:00
TreeHugger Robot
546feccda1 Merge "Fix DecorView error about non-visual context" into rvc-dev am: 8927986f3b am: 64b0a51b1b
Change-Id: I60cf98662d85f780d01ee0f02b1587193bff2752
2020-03-30 18:51:42 +00:00
TreeHugger Robot
2e5799ae71 Merge "Fix flickers when changing control" into rvc-dev am: c322ed2173 am: 162040e358 am: b88c500fea am: 3cb2ddd649
Change-Id: I5a7d6e658add347463be56e4022d31ccc1e30a04
2020-03-30 18:14:52 +00:00
TreeHugger Robot
d08a399a81 Merge "Fix DecorView error about non-visual context" into rvc-dev am: 8927986f3b am: 64b0a51b1b am: 776ff41d18 am: aaec840228
Change-Id: I7a3e288a6634da4d26120edcbbb0024bd1cf5146
2020-03-30 18:12:32 +00:00
arangelov
27608554dc Show empty state screens in order of priority.
To improve the user experience, this CL changes the order
in which the empty state screens are shown:
1. (highest priority) cross-profile disabled by policy
2. no apps available
3. (least priority) work is off

The intention is to prevent the user from having to turn
the work profile on if there will not be any apps resolved
anyway.

Fixes: 150936283
Test: atest ResolverActivityTest
Test: atest ChooserActivityTest
Test: manually tested each possible combination of edge cases
(work profile off, no apps found, cross-profile intents disabled)

Change-Id: Ic86c90bdda93cf731df2133890081b5583ef35e1
2020-03-30 17:00:09 +00:00
TreeHugger Robot
b2ea161c2d Merge "Fix flickers when changing control" into rvc-dev am: c322ed2173
Change-Id: I2c211d58c0ecd562f7bf80a686cbd4a12bac0b9a
2020-03-30 11:56:00 +00:00
TreeHugger Robot
c322ed2173 Merge "Fix flickers when changing control" into rvc-dev 2020-03-30 11:45:54 +00:00