Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
556,422 Commits 3 Branches 0 Tags
484f837acc4ce4e548b3e397cc27a527260d6d7c
Commit Graph

14272 Commits

Author SHA1 Message Date
TreeHugger Robot
484f837acc Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa am: 1650966ee2 am: 99c911561b am: b83432723e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: Ifabbde8465d4808f6fe9ba86663df6275ce59a64
 2020-06-11 17:36:58 +00:00
TreeHugger Robot
99c911561b Merge "Strip formatting from convo senders and title" into rvc-dev am: 954574cfaa am: 1650966ee2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817528

Change-Id: Ib2cdcb015341e80811d7ca1a3449771c42350042
 2020-06-11 17:16:28 +00:00
TreeHugger Robot
954574cfaa Merge "Strip formatting from convo senders and title" into rvc-dev 2020-06-11 16:14:44 +00:00
TreeHugger Robot
a1a251f46e Merge "Kill off callback reference as soon as credential is verified" into rvc-dev am: 998df4f345 am: 13dbfb2843 am: e099486f73 am: a5759dd1c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721688

Change-Id: I3e8190d15aa236d1b87512a7b4054c8b9bc18b5d
 2020-06-11 12:41:03 +00:00
TreeHugger Robot
a5759dd1c4 Merge "Kill off callback reference as soon as credential is verified" into rvc-dev am: 998df4f345 am: 13dbfb2843 am: e099486f73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721688

Change-Id: I4ec796548fd8acede93329e294d2cdb9ff4a319b
 2020-06-11 12:26:23 +00:00
TreeHugger Robot
5b11cac469 Merge "Kill off callback reference as soon as credential is verified" into rvc-dev am: 998df4f345 am: 13dbfb2843 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11721688

Change-Id: Ia96be987943252256f1b0ad7d5cd889988ae0cbf
 2020-06-11 12:01:02 +00:00
Automerger Merge Worker
5e13814727 Merge "Merge "Fix broken test" into rvc-dev am: 95e41f279d am: 4442839c7b am: 801d335e1e" into rvc-qpr-dev-plus-aosp am: c776191f76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818179

Change-Id: I3995a56f93aa29956a2b940559e79c88961c3e19
 2020-06-11 11:52:55 +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
Dmitri Plotnikov
70b73fe083 Merge "Add plumbing to collect Binder stats for battery attribution" 2020-06-10 22:19:21 +00:00
Matt Pietal
90e7130762 Merge "Sharesheet - Fix logic for a-z count" into rvc-dev am: c3e572fc74 am: 4ff6a77009 am: 01e6e2256b am: aa8beceba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820081

Change-Id: I94ee4bd9e3b964a21ce0ea793753e552c2b8afae
 2020-06-10 21:07:58 +00:00
Matt Pietal
01e6e2256b Merge "Sharesheet - Fix logic for a-z count" into rvc-dev am: c3e572fc74 am: 4ff6a77009 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820081

Change-Id: I6db953cab17e5b79c93a778e1f72c9d7509d714c
 2020-06-10 20:44:22 +00:00
TreeHugger Robot
f1f74a7670 Merge "Conversations UX polish pass" into rvc-dev am: 62a1b9d17e am: fe7e3019d2 am: 305b4a8032 am: 15676d4a75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821053

Change-Id: I334801455af2fa84d33dc8f4e6325aff9309b263
 2020-06-10 20:31:48 +00: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
2e4d397644 Merge "Sharesheet - Disable expansion" into rvc-dev am: dc9a555126 am: 2606c5f859 am: f0f70c9434 am: 91710dbad2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820086

Change-Id: Idccca142c3e161fe177ef8e19eb02521fbbd7962
 2020-06-10 20:01:28 +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
TreeHugger Robot
91710dbad2 Merge "Sharesheet - Disable expansion" into rvc-dev am: dc9a555126 am: 2606c5f859 am: f0f70c9434 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820086

Change-Id: I1c771ad6dc7f2a13a8073093f3d38de33513b471
 2020-06-10 19:47:22 +00: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
Dmitri Plotnikov
305ee3e98e Add plumbing to collect Binder stats for battery attribution 
Bug: 158232997
Test: atest FrameworksCoreTests:com.android.internal.os.BinderCallsStatsTest

Change-Id: Icbccd26e20bc4ead13ffeac76b851af39269ca89
 2020-06-10 12:09:41 -07: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
68859d484e Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 am: 5722d5f2c4 am: 2285eb8838 am: 6240096398 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: Ib58ae91ef7a2bc17b893008f2056982f8566f408
 2020-06-10 13:50:02 +00:00
TreeHugger Robot
6240096398 Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 am: 5722d5f2c4 am: 2285eb8838 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814420

Change-Id: I50bcc463724039f014ea25d7c9f3ec8939689d53
 2020-06-10 13:39:03 +00: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
Matt Pietal
e422947f79 Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f am: 9e1353668b am: f8a46b6ff1 am: 1f282561b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: I3ee2b2ec8179c621a153baea88fb38cc61081a12
 2020-06-10 13:06:08 +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
f8a46b6ff1 Merge "Sharesheet - Disable delegate" into rvc-dev am: a4614b0f1f am: 9e1353668b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11814085

Change-Id: Ibee5a36b677df2115f0ae39e651dc6d1d4bb552b
 2020-06-10 12:34:56 +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
Automerger Merge Worker
2f7e3b1cbc Merge "Merge "Adjust conversation layout paddings to match UX spec" into rvc-dev am: acea7d392c am: 3b8ff482c3 am: 41085a0639" into rvc-qpr-dev-plus-aosp am: 1293a74d21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813182

Change-Id: I280969a8f36fb9fe4636daa0253cd10057942238
 2020-06-09 23:00:51 +00:00
TreeHugger Robot
6ddeada31c Merge "Adjust conversation layout paddings to match UX spec" into rvc-dev am: acea7d392c am: 3b8ff482c3 am: 41085a0639 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813182

Change-Id: I4393b198864515cf12084e27ff22cee21ae82cbf
 2020-06-09 22:46:12 +00:00
TreeHugger Robot
143d674eee Merge "Adjust conversation layout paddings to match UX spec" into rvc-dev am: acea7d392c am: 3b8ff482c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11813182

Change-Id: Iec093e5520b6a202ee120f7bcbbd8c7fb461b969
 2020-06-09 22:35:18 +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
Automerger Merge Worker
16fb6dd4b5 Merge "Merge "Add importance ring animation on convo priority change" into rvc-dev am: 80d5c61da5 am: 8cb827b044 am: 1eb955461a" into rvc-qpr-dev-plus-aosp am: 52e427f01b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739864

Change-Id: Id4f36143a3a0193759c651d142ff776f5589ff8b
 2020-06-09 16:15:48 +00:00
TreeHugger Robot
26e09017ac Merge "Add importance ring animation on convo priority change" into rvc-dev am: 80d5c61da5 am: 8cb827b044 am: 1eb955461a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739864

Change-Id: If4cc68635a5d3c66d9004d4621beda4e5503b8f3
 2020-06-09 16:01:07 +00:00
TreeHugger Robot
e4db741936 Merge "Add importance ring animation on convo priority change" into rvc-dev am: 80d5c61da5 am: 8cb827b044 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739864

Change-Id: Ic7dcfb84e1c528738f2ffa604ab69e8563bbd968
 2020-06-09 15:47:24 +00: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
TreeHugger Robot
0b2dbedeaa Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev am: b121512580 am: 4f93e9c80c am: f3b9965750 am: bb8e0b922a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11686078

Change-Id: Ife20398017639b41019d3ee58e3179cf31b3da2e
 2020-06-09 14:27:19 +00:00
TreeHugger Robot
f3b9965750 Merge "Report WINDOW_FOCUS_GAIN_REPORT_ONLY when the served connection remains" into rvc-dev am: b121512580 am: 4f93e9c80c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11686078

Change-Id: I37a0e10e7b9d84e2411636fdbfbbb43a9a6d2e8c
 2020-06-09 14:08:44 +00:00