Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
420,459 Commits 3 Branches 0 Tags
b448dbc0fc581fd1134aec7bf74257cc7723f686
Commit Graph

420459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Renouf
b448dbc0fc Merge "Updates BubbleData sorting and grouping to spec" into qt-dev am: d6cddfedf9 
am: 5a3826bead

Change-Id: If58709393408c875253364860582316fdf133ea3
 2019-05-08 10:45:38 -07:00
Mark Renouf
5a3826bead Merge "Updates BubbleData sorting and grouping to spec" into qt-dev 
am: d6cddfedf9

Change-Id: Id07b8330b9d85a81663ba8ba0154c01421deffab
 2019-05-08 10:30:12 -07:00
Felipe Leme
6916eda7c2 Merge "Disable existing ContentCapture sessions if service changes their whitelist status." into qt-dev am: d97db54da4 
am: a182f9c95f

Change-Id: I6463bd892ce0f0e67449988e40e0b2ac40598bea
 2019-05-08 10:22:42 -07:00
Felipe Leme
a182f9c95f Merge "Disable existing ContentCapture sessions if service changes their whitelist status." into qt-dev 
am: d97db54da4

Change-Id: I2e404b24e66d02afcc9ab64f15b67d391f914997
 2019-05-08 10:07:36 -07:00
Mark Renouf
d6cddfedf9 Merge "Updates BubbleData sorting and grouping to spec" into qt-dev 2019-05-08 16:58:20 +00:00
Felipe Leme
d97db54da4 Merge "Disable existing ContentCapture sessions if service changes their whitelist status." into qt-dev 2019-05-08 16:34:17 +00:00
Torne (Richard Coles)
b8a473d462 Merge "Increase 32-bit WebView VA reservation." into qt-dev am: c7c7f9ecd7 
am: e5b1bc3f5f

Change-Id: I4e7f0e29b9bfe3bd14f54f1f65b7019dd1e43702
 2019-05-08 09:32:37 -07:00
Torne (Richard Coles)
e5b1bc3f5f Merge "Increase 32-bit WebView VA reservation." into qt-dev 
am: c7c7f9ecd7

Change-Id: I82628f43fe6e3f8d520424536d0b1918760e08e2
 2019-05-08 09:15:49 -07:00
Eric Laurent
4ac921f5e3 Merge "AudioService: refine concurrent capture policy" into qt-dev am: 105d1edaa2 
am: 7ce531699d

Change-Id: If2d0cd6ca8d7a4e5d0a5ff6176bb30b026e4d477
 2019-05-08 09:14:37 -07:00
Eric Laurent
7ce531699d Merge "AudioService: refine concurrent capture policy" into qt-dev 
am: 105d1edaa2

Change-Id: I8950e009810ad83f0055f3208787684e7fdc67f9
 2019-05-08 08:54:09 -07:00
TreeHugger Robot
c7c7f9ecd7 Merge "Increase 32-bit WebView VA reservation." into qt-dev 2019-05-08 15:41:50 +00:00
Eric Laurent
105d1edaa2 Merge "AudioService: refine concurrent capture policy" into qt-dev 2019-05-08 15:36:25 +00:00
Fabian Kozynski
15ef889119 Merge "Scale all StatusBarIconView status icons to 17dp" into qt-dev am: 0d74728638 
am: 63c8b74e6d

Change-Id: I0c17c851c82595dedbb448a86d3ec018c9d6e7cc
 2019-05-08 08:25:08 -07:00
Mark Renouf
ba5ab51bc3 Updates BubbleData sorting and grouping to spec 
This change adds onBubbleOrderChanged to BubbleStackView
to try to keep the order synchronized. There are some known
issues with the animation and visual state, which will be
addressed in a follow up CL.

Bug: 123542488
Test: BubbleControllerTest BubbleDataTest
Change-Id: Ie5a679df2f3069236f4d67a3fce4189b39b9eb28
 2019-05-08 11:23:15 -04:00
Fabian Kozynski
63c8b74e6d Merge "Scale all StatusBarIconView status icons to 17dp" into qt-dev 
am: 0d74728638

Change-Id: I3ff4621746cf80c812a20a77b6e2e1d921890488
 2019-05-08 08:15:03 -07:00
TreeHugger Robot
0d74728638 Merge "Scale all StatusBarIconView status icons to 17dp" into qt-dev 2019-05-08 14:52:24 +00:00
Jorim Jaggi
637d6cd468 Merge "Pretend to be having the original background" into qt-dev am: f9363aadeb 
am: cd60bc92a4

Change-Id: I31b1f353cddb2239631f47a159ac9bb98cbb9bc2
 2019-05-08 05:52:32 -07:00
Jorim Jaggi
cd60bc92a4 Merge "Pretend to be having the original background" into qt-dev 
am: f9363aadeb

Change-Id: I41bb04676fd23fc968db37417b2cfc5c51aede20
 2019-05-08 05:42:59 -07:00
Jorim Jaggi
f9363aadeb Merge "Pretend to be having the original background" into qt-dev 2019-05-08 12:21:53 +00:00
Lorenzo Colitti
b39d30351f [automerger skipped] Merge "Add EPROTONOSUPPORT to IpSecManager SSE map" into qt-dev am: a1a0653dab -s ours 
am: 21fff9c0c7 -s ours
am skip reason: change_id Iec3d5fc4a9bcad7c104414afefae775232d46558 with SHA1 dcbc670688 is in history

Change-Id: I6bd69e682abcd0c6b2310506ccd6b225a26f1bb4
 2019-05-08 02:49:24 -07:00
Lorenzo Colitti
21fff9c0c7 [automerger skipped] Merge "Add EPROTONOSUPPORT to IpSecManager SSE map" into qt-dev 
am: a1a0653dab -s ours
am skip reason: change_id Iec3d5fc4a9bcad7c104414afefae775232d46558 with SHA1 dcbc670688 is in history

Change-Id: Ifb346ddf63b0d6547f3c67110c17c630f3aa72c9
 2019-05-08 02:37:04 -07:00
Lorenzo Colitti
a1a0653dab Merge "Add EPROTONOSUPPORT to IpSecManager SSE map" into qt-dev 2019-05-08 09:20:09 +00:00
Kevin Chyn
e06f33c883 Do not set positive button visibility if dialog is from restored state am: 30c76081f5 
am: fecf157091

Change-Id: Ib5fb4313931efd9b5d2d529da4606e58e804ce30
 2019-05-08 00:48:51 -07:00
Kevin Chyn
91eb85c98c Merge "Get color directly and remove redundant clearMessage()" into qt-dev am: 4b9f575018 
am: ac2dbe25c5

Change-Id: Ib25ba670e45331d96c4e07ccddf36bdf3e8bd824
 2019-05-08 00:31:38 -07:00
Kevin Chyn
fecf157091 Do not set positive button visibility if dialog is from restored state 
am: 30c76081f5

Change-Id: If0d25995069aeeaff9e50fbfac9c492a684493a2
 2019-05-08 00:29:13 -07:00
Kevin Chyn
0d777aaeb6 Merge "Update BiometricPrompt colors" into qt-dev am: 09688e30f3 
am: 40331e3f63

Change-Id: If16fce96fbf3871b722bae3f55f739319df492ae
 2019-05-08 00:17:50 -07:00
Kevin Chyn
30c76081f5 Do not set positive button visibility if dialog is from restored state 
Also fix hidden dependency where positive button is enabled through
a dependency. Explicitly set visiblity where setEnabled occurs now.

Fixes: 132203917

Test: manual
Change-Id: Iba1e01a7c6b64a0f6a2721ddffac9d785981e9a0
 2019-05-08 07:16:30 +00:00
Hyunyoung Song
0c2e4a04b8 Merge "ic_corp_badge shape change on adaptive icon shape change" into qt-dev am: e967fe3dab 
am: df0be35708

Change-Id: I1967f0fb965e35cbcb95604c5bf1134989664fdf
 2019-05-08 00:00:20 -07:00
Kevin Chyn
ac2dbe25c5 Merge "Get color directly and remove redundant clearMessage()" into qt-dev 
am: 4b9f575018

Change-Id: I69e12a8c377765e0f7287a3cd175a2cdfbc892c2
 2019-05-08 00:00:03 -07:00
Christopher Dombroski
dbab6d8d92 [automerger skipped] OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba am: e2d4ed92b4 am: abbe99e0f0 -s ours am: 751bca7461 -s ours 
am: 145bf14205 -s ours
am skip reason: change_id I2578251906f6656b83464d1c4fc4db99165841c9 with SHA1 acc75528ff is in history

Change-Id: I5b334cf0e32a735789cd51be0278f122802239ba
 2019-05-07 23:53:01 -07:00
Kevin Chyn
40331e3f63 Merge "Update BiometricPrompt colors" into qt-dev 
am: 09688e30f3

Change-Id: Id87aa2cf6733099ee05b59d68ef313fac42472e5
 2019-05-07 23:51:46 -07:00
Frank Li
1ddb470d2a [automerger skipped] Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information" am: 8ff4a5a5b5 am: 351cc241da -s ours 
am: a75134f89f -s ours
am skip reason: change_id Ib75affea5d849437a293affbe294732153511d97 with SHA1 a2e19c0f91 is in history

Change-Id: I149b823d50fa8d72256ed0a550ab759fa5fcec49
 2019-05-07 23:38:09 -07:00
Kevin Chyn
4b9f575018 Merge "Get color directly and remove redundant clearMessage()" into qt-dev 2019-05-08 06:26:56 +00:00
Kevin Chyn
09688e30f3 Merge "Update BiometricPrompt colors" into qt-dev 2019-05-08 06:25:01 +00:00
Winson Chung
1123abc384 Merge "Ensure we only remove messages for the same app info" into qt-dev am: a69375ec2e 
am: 2d181c2f41

Change-Id: I6d67d8b719fc86e8378b0ae98e29a77ba0c15c6b
 2019-05-07 23:20:57 -07:00
Hyunyoung Song
df0be35708 Merge "ic_corp_badge shape change on adaptive icon shape change" into qt-dev 
am: e967fe3dab

Change-Id: I1303877c07ea567d06b3a46db5ffbc2d9dc5347a
 2019-05-07 22:42:24 -07:00
Christopher Dombroski
145bf14205 [automerger skipped] OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba am: e2d4ed92b4 am: abbe99e0f0 -s ours 
am: 751bca7461 -s ours
am skip reason: change_id I2578251906f6656b83464d1c4fc4db99165841c9 with SHA1 acc75528ff is in history

Change-Id: Ia1e3e16e977240985ce83fb794df4fbb27c3bc33
 2019-05-07 22:34:47 -07:00
Kevin Chyn
66650bc481 Merge "Handle [error->pending_confirmation] and [error->authenticated] animations" into qt-dev am: 9d4fda2a96 
am: 69164ae5fa

Change-Id: I20c499520cc6bc63d807420d35e27428499b2890
 2019-05-07 22:22:24 -07:00
Felipe Leme
b2ec7c57f1 [automerger skipped] Merge "Added moar augmented-autofill metrics:" into qt-dev am: e1ddd8bd94 
am: 19b68d95ea -s ours
am skip reason: change_id Ia6bfced9396dd9e3f8ef2a6c45415dc22f4327c9 with SHA1 b8662f1201 is in history

Change-Id: Ia8a35a5a567b28d6ff4400eea51f015d08d8f34f
 2019-05-07 22:14:55 -07:00
Hyunyoung Song
e967fe3dab Merge "ic_corp_badge shape change on adaptive icon shape change" into qt-dev 2019-05-08 05:10:00 +00:00
Frank Li
a75134f89f [automerger skipped] Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information" am: 8ff4a5a5b5 
am: 351cc241da -s ours
am skip reason: change_id Ib75affea5d849437a293affbe294732153511d97 with SHA1 a2e19c0f91 is in history

Change-Id: I48d208d7b24c2cc7f95be824f1de6de0cbcd9e57
 2019-05-07 21:55:04 -07:00
Svetoslav Ganov
b7da8e3d86 Merge "Restricted permission whitelisted by default" into qt-dev am: 650cb05202 
am: a8a430670e

Change-Id: Ie553b81c35f12a5ac87f2cadc544f97e78d93d32
 2019-05-07 21:54:44 -07:00
Nikita Ioffe
e65c13dbee Merge "Do not check for APEX and APK package name collisions during normal boot" into qt-dev am: 060b4115db 
am: 8d9465d5d0

Change-Id: I9c0ef694d427b9123314e6542c2d92535c570605
 2019-05-07 21:47:43 -07:00
Christopher Dombroski
751bca7461 [automerger skipped] OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba am: e2d4ed92b4 
am: abbe99e0f0 -s ours
am skip reason: change_id I2578251906f6656b83464d1c4fc4db99165841c9 with SHA1 acc75528ff is in history

Change-Id: I7bb9a8f7dbbffe346f383cb1e33463a6389f1a4f
 2019-05-07 21:45:43 -07:00
Chen Xu
2dc28f416d Merge "listen to correct intent extra for defaultSubIdChange" into qt-dev am: 9bac8d52ce 
am: 6889388ed6

Change-Id: I3a4e1151fc4b696b59339447993acf89e6e14c67
 2019-05-07 21:42:29 -07:00
Winson Chung
2d181c2f41 Merge "Ensure we only remove messages for the same app info" into qt-dev 
am: a69375ec2e

Change-Id: I7b0de9f5b74c65fadac202835633a2f53e2b2a3b
 2019-05-07 21:26:38 -07:00
Kevin Chyn
23338423b7 Merge "Update acquired strings" into qt-dev am: 4bf862c07b 
am: 26064add6f

Change-Id: I42733c043ae72e29580f4aef79aa4976e36aea66
 2019-05-07 21:23:12 -07:00
Frank Li
351cc241da Merge "Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information" 
am: 8ff4a5a5b5

Change-Id: I16ada24faf991dc95326c9c56df9daa3a07519ba
 2019-05-07 21:18:01 -07:00
Christopher Dombroski
abbe99e0f0 OP_REQUEST_INSTALL_PACKAGES denied by default am: 43e682abef am: 93780658ba 
am: e2d4ed92b4

Change-Id: I7b440302c64f54d33ec4afce2ac517288cc5cba6
 2019-05-07 21:12:12 -07:00
Kevin Chyn
69164ae5fa Merge "Handle [error->pending_confirmation] and [error->authenticated] animations" into qt-dev 
am: 9d4fda2a96

Change-Id: I49961ea4aad98721d1100c4da823c0bbc330d3a6
 2019-05-07 20:54:39 -07:00