Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
557,075 Commits 3 Branches 0 Tags
83bdcefe4df7ac05e5cfdec5b585a14364fdda74
Commit Graph

14442 Commits

Author SHA1 Message Date
Yunfan Chen
a40a3dca57 Merge "Remove IME surface when occured in multi-window mode" into rvc-dev am: b55bc82d13 am: 13212d164e am: a2351f080f am: a79d150a3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11612967

Change-Id: Iecbbe8110ef58be2a452a97c4394f6362bde19ee
 2020-06-12 04:10:33 +00: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
4751cc9227 Merge "As foretold, this release goes to eleven." into rvc-dev am: 5c71678253 am: bc5db39866 am: 31f634028c am: fb02dc9f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798682

Change-Id: Ic06e985465f3fb14ef5640d939ef0250b12d97a8
 2020-06-12 00:18:35 +00:00
Daniel Sandler
fb02dc9f3f Merge "As foretold, this release goes to eleven." into rvc-dev am: 5c71678253 am: bc5db39866 am: 31f634028c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11798682

Change-Id: Ic675df1df36987387a6520f3859fc957741d5977
 2020-06-11 23:23:19 +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
6acdb4013a Merge "Fix restoring vertical scroll after horizontal." into rvc-dev am: b367074347 am: f4644641c6 am: ba34c5b156 am: e4af3bb981 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838099

Change-Id: I69c6e8412813cbb04425ec910019c90790845638
 2020-06-11 19:57:29 +00:00
TreeHugger Robot
e4af3bb981 Merge "Fix restoring vertical scroll after horizontal." into rvc-dev am: b367074347 am: f4644641c6 am: ba34c5b156 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838099

Change-Id: I276c792b22f4cc3f7f04dbb4d26b48358b205cd1
 2020-06-11 19:42:17 +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
a7565c1bd1 Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac am: e97c7fbfec am: bd1153d52d am: 56640d5623 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: I75d4cffbe410dc41309dbfbb8db772bbd3adacea
 2020-06-11 19:22:00 +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
bd1153d52d Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690cac am: e97c7fbfec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: Id487db769b688dbc29c4a6b2d8de4e7b0e3d9b1f
 2020-06-11 18:59:56 +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
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
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
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
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
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
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
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