Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
510,198 Commits 3 Branches 0 Tags
94fe22f674cd2b8a43fe7031bf6a9c0164ccbc7a
Commit Graph

13796 Commits

Author SHA1 Message Date
Jorim Jaggi
1be0abe801 Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev am: 8ec4d3a33f am: b589824526 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862408

Change-Id: Id5cc186977217a4da3f3744b2d7c92385b00c9d4
 2020-06-16 13:17:28 +00:00
Jorim Jaggi
8ec4d3a33f Merge "Revert "Revert "Remove IME surface when occured in multi-window mode""" into rvc-dev 2020-06-16 12:56:20 +00:00
Yunfan Chen
c02a5ac5bb Revert "Revert "Remove IME surface when occured in multi-window mode"" 
This reverts commit 2a38a35622.

Reason for revert: The original CL was reverted for b/158836294 and it turned out to be innocent. Re-land the CL.

Bug: b/155660756

Change-Id: Iada83e80059e7cb9566bb7ad4e4c9909b4ed794a
 2020-06-16 01:54:41 +00:00
TreeHugger Robot
0fa463656b Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev am: 3fb94d8e9d am: 86efe0fa3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859967

Change-Id: I2b8d95ca738b9912144c596bb5d795b9ad75bac8
 2020-06-15 12:45:09 +00:00
TreeHugger Robot
3fb94d8e9d Merge "Add logging on sharesheet displayList to help investigate issue that icons launch different apps unexpectedly." into rvc-dev 2020-06-15 12:12:07 +00:00
Lorenzo Colitti
74ec0c3117 Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e am: 77caef4748 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: Ic6fce773baa8e99197eac94b0334c77bf27d591f
 2020-06-15 09:34:17 +00:00
Lorenzo Colitti
242087ad3e Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev 2020-06-15 09:06:29 +00:00
Song Hu
f473e42f96 Add logging on sharesheet displayList to help investigate issue that icons launch 
different apps unexpectedly.

Bug: 158172791
Test: manual test on the phone
Change-Id: I003b83f6a76dca2f97cfd43b2f265ad572f0e5c5
 2020-06-14 14:50:54 -07:00
TreeHugger Robot
ad8d6ad319 Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev am: a840c1f3ea am: 8070800916 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838105

Change-Id: Ia9379370ad00173e7dd960e925ec48412a186978
 2020-06-12 23:34:28 +00:00
TreeHugger Robot
a840c1f3ea Merge "Revert "Remove IME surface when occured in multi-window mode"" into rvc-dev 2020-06-12 23:08:13 +00:00
Jerome Gaillard
2a38a35622 Revert "Remove IME surface when occured in multi-window mode" 
This reverts commit 460dabda46.

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testTopPositionSwitchOnTapTimeoutDifferentProcess&testClass=android.server.wm.lifecycle.ActivityLifecycleTopResumedStateTests&atpConfigName=cts%2Fframework%2Fgce-presubmit-wm-cloud-tf-3&testModule=CtsWindowManagerDeviceTestCases&fkbb=6585261&lkbb=6585728&lkgb=6581565&testResults=true&badBuildCount=13&branch=git_rvc-qpr-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug, bug b/158836294

Bug: 158836294
Change-Id: Iec015564030658845a5b1262c23c5b72570af9cf
 2020-06-12 22:45:20 +00:00
Miranda Kephart
9d49aef765 Merge "Check for null service in ScreenshotHelper" into rvc-dev am: 1e23e8e274 am: 60a013ceea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852405

Change-Id: I5223cbfd7c570f2a57069bc5636da62fb5223e06
 2020-06-12 20:20:05 +00:00
Miranda Kephart
33aff26285 Check for null service in ScreenshotHelper 
We were testing whether mScreenshotConnection was null as a proxy
for whether we had a running screenshot service. In principle
mScreenshotService should never be null if mScreenshotConnection
is not null, but it's safer to check. This may fix the crash noticed in
early May (attached bug), and either way is better for the stability
of the process.

Bug: 156366251
Fix: 156366251
Test: manual
Change-Id: Iea669a5a2ca2334760141ec6fec8ec7ffb01f25c
 2020-06-12 13:04:18 -04:00
Yunfan Chen
13212d164e Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: Ica2e2cf709d05df0eadd340c42a7c2d976627953
 2020-06-12 03:25:47 +00:00
Yunfan Chen
b55bc82d13 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev 2020-06-12 03:05:54 +00:00
Daniel Sandler
58620b4e55 Merge "As foretold, this release goes to eleven." into rvc-dev am: 5c71678253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798682

Change-Id: Ibba87039df9885ddf28b6cee61fdc3242ab203e2
 2020-06-11 22:57:10 +00:00
Daniel Sandler
5c71678253 Merge "As foretold, this release goes to eleven." into rvc-dev 2020-06-11 22:55:23 +00:00
TreeHugger Robot
5b34a3678e Merge "Fix restoring vertical scroll after horizontal." into rvc-dev am: b367074347 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838099

Change-Id: I89de0f3ee8285b204ef3ba8ca16589694def7cd2
 2020-06-11 19:23:06 +00:00
TreeHugger Robot
b367074347 Merge "Fix restoring vertical scroll after horizontal." into rvc-dev 2020-06-11 19:18:16 +00:00
TreeHugger Robot
bf52673a6a Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: Icc00a6f35213958cb5badfb4e7311e646608b1bf
 2020-06-11 18:41:57 +00:00
TreeHugger Robot
0561690cac Merge "Apply theme shape clipping to group convo avatars" into rvc-dev 2020-06-11 18:22:46 +00:00
TreeHugger Robot
eb7f4f0ed6 Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: I10dc8bc64c09190151664a0f7054fbdbfd7ca70d
 2020-06-11 16:18:49 +00:00
TreeHugger Robot
954574cfaa Merge "Strip formatting from convo senders and title" into rvc-dev 2020-06-11 16:14:44 +00:00
arangelov
0e383d7872 Fix restoring vertical scroll after horizontal. 
Fixes: 158622814
Test: manual
Change-Id: I310566d57f83b3aba5e015873ec4c48a9243fbf0
 2020-06-11 15:52:13 +01:00
TreeHugger Robot
76f92d981b Merge "Kill off callback reference as soon as credential is verified" into rvc-dev am: 998df4f345 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721688

Change-Id: I3b15bf5acb23746ddad579b9b35f8eb2283169f7
 2020-06-11 11:48:19 +00:00
TreeHugger Robot
998df4f345 Merge "Kill off callback reference as soon as credential is verified" into rvc-dev 2020-06-11 11:39:57 +00:00
Antoan Angelov
4442839c7b Merge "Fix broken test" into rvc-dev am: 95e41f279d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818179

Change-Id: If2bfe029da1569be4c13aa08cd0d1c4441b5519b
 2020-06-11 11:04:27 +00:00
Antoan Angelov
95e41f279d Merge "Fix broken test" into rvc-dev 2020-06-11 10:56:55 +00:00
Steve Elliott
242057d6f9 Strip formatting from convo senders and title 
Fixes: 155919582
Test: manual
Change-Id: I942050db02b4a559fb9ffcc6c9929e49f2f7232f
 2020-06-10 21:12:14 -04:00
Matt Pietal
f13dbe1a64 Merge "Sharesheet - Fix logic for a-z count" into rvc-dev am: c3e572fc74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820081

Change-Id: I5e8007be4e570a84d5cba6f2a694bee8893089d2
 2020-06-10 20:24:42 +00:00
Matt Pietal
c3e572fc74 Merge "Sharesheet - Fix logic for a-z count" into rvc-dev 2020-06-10 20:10:15 +00:00
TreeHugger Robot
fe7e3019d2 Merge "Conversations UX polish pass" into rvc-dev am: 62a1b9d17e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821053

Change-Id: I862dcd0507e86caa1329b46eb8eb602fb32cf39b
 2020-06-10 19:52:16 +00:00
TreeHugger Robot
62a1b9d17e Merge "Conversations UX polish pass" into rvc-dev 2020-06-10 19:48:56 +00:00
Steve Elliott
86bc69a491 Apply theme shape clipping to group convo avatars 
Fixes: 158493588
Test: manual
Change-Id: I57b5e0712822b345c9dcce74b8a6d6ff33409de6
 2020-06-10 15:23:33 -04:00
TreeHugger Robot
f380ccaf3d Merge "Sharesheet - Disable expansion" into rvc-dev am: dc9a555126 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820086

Change-Id: I900d125379a91c1b3a7640d10c1c79e75c78ce9f
 2020-06-10 19:22:39 +00:00
TreeHugger Robot
dc9a555126 Merge "Sharesheet - Disable expansion" into rvc-dev 2020-06-10 19:07:05 +00:00
arangelov
24156fa7b1 Fix broken test 
Fixes: 158656507
Test: atest ChooserActivityTest#testWorkTab_selectingWorkTabWithPausedWorkProfile_directShareTargetsNotQueried
Change-Id: I875de96d4847575e6369724ca2c95b828befb5af
 2020-06-10 19:21:32 +01:00
Steve Elliott
282498aaa5 Conversations UX polish pass 
- adjust position of expanded group avatar to remain vertically
    centered with title

  - adjust top padding of guts to match that of conversation layout

  - vertically align app name and time in the conversation header

  - clean up some of our XML styles

Fixes: 157757386
Test: manual, visual
Change-Id: I5eb774b44ce641a97c5deb706711f3b252e6554e
 2020-06-10 14:02:09 -04:00
Matt Pietal
185f715e77 Sharesheet - Disable expansion 
Leave disabled until more apps are using sharing shortcuts

Fixes: 157065816
Test: atest ChooserActivityTest
Change-Id: I7f8811617fe2f3a77f86b8459c7f06b0929a40c9
 2020-06-10 11:40:55 -04:00
Matt Pietal
1245b38b60 Sharesheet - Fix logic for a-z count 
Prior logic only counted the number of grouped items. This could
result in the a-z list not being shown even though there were
additional targets. For instance, if 1 group had 9 targets, a-z
would've been hidden even though only 4 targets were present in the
ranked app row, resulting in 5 targets being inaccessible.

Fixes: 158017940
Test: atest ChooserActivityTest#fourOptionsStackedIntoOneTarget
Change-Id: I58e262e40f3064ce8a091e44d6b00163c8f4e4f3
 2020-06-10 11:16:55 -04:00
TreeHugger Robot
4512999c22 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: Id11801611054f88a91c81107497e0d0434f82a8f
 2020-06-10 13:13:12 +00:00
TreeHugger Robot
f6793af032 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev 2020-06-10 13:04:23 +00:00
Matt Pietal
2a76a6928b Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: I15493708dd65c138ab449bbb81cb27cb87e20df7
 2020-06-10 12:21:58 +00:00
Matt Pietal
a4614b0f1f Merge "Sharesheet - Disable delegate" into rvc-dev 2020-06-10 12:06:23 +00:00
TreeHugger Robot
7aa4e3e9df Merge "Adjust conversation layout paddings to match UX spec" into rvc-dev am: acea7d392c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813182

Change-Id: Ife5ecf982f6be56e399ddf1feef3017b728d6b31
 2020-06-09 22:19:37 +00:00
Mike Digman
4141daa946 Tweak Sharesheet DS icon rendering to ignore system shapes 
Directly renders AdaptiveIconDrawables to avoid normal masking
by the user applied icon shape. Shifts insetting to DS circle
masking to avoid clipping issues.

Test: manual
Fixes: 158318613
Change-Id: I2abc6f866500f2d8045af46278e9bac6a53458fc
 2020-06-09 14:42:21 -07:00
Matt Pietal
9a178365c4 Sharesheet - Disable delegate 
The original plan was to move sharesheet into systemui. The first
step was to route through a delegate living in systemui, which 
would just launch the activity. However, the full migration has not
occurred. And more notably, there are intermittent race conditions
caused by token expiration. This comes from the framework activity token
being removed just before the target intent is launched, due to the
requirement to call finish() on resolver/chooser when complete.

Fixes: 157272342
Test: atest ChooserActivityTest ResolverActivityTest
Change-Id: I75ca19589ba78abc1d1a05a917457c151420c949
 2020-06-09 21:33:46 +00:00
Steve Elliott
666124b0c5 Adjust conversation layout paddings to match UX spec 
Fixes: 157757386
Fixes: 157144647
Test: manual, visual
Change-Id: Ibeccc0fe2269aea69b882895fbb1a280cd6bf126
 2020-06-09 15:59:58 -04:00
TreeHugger Robot
f4db31bacb Merge "Add importance ring animation on convo priority change" into rvc-dev am: 80d5c61da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739864

Change-Id: I8fa7a45a1e3d4f460fe95e1012722d180c4dc40f
 2020-06-09 15:34:31 +00:00
TreeHugger Robot
80d5c61da5 Merge "Add importance ring animation on convo priority change" into rvc-dev 2020-06-09 15:33:55 +00:00