Commit Graph

661724 Commits

Author SHA1 Message Date
Adam He
a8018e499f Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46 am: 0fe0c2b361
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: I582b1d24b27cb76dc81cc12a79a1f95acc5b8892
2021-07-27 19:16:05 +00:00
Adam He
0fe0c2b361 Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev am: e31184cb46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362681

Change-Id: If605d300d5b7d4cbf7038566c885d6c274b60d46
2021-07-27 18:51:02 +00:00
Adam He
e31184cb46 Merge "Fix inline autofill not working if both afservice and keyboard support it, but keyboard disabled inline support manually." into sc-dev 2021-07-27 18:31:08 +00:00
Lucas Dupin
872dc79d2e Merge "Offload Luma Sampling IPC to background thread" into sc-v2-dev am: 69eef091b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388784

Change-Id: Ibd75deff7e7eadff2276419741356fc3b98e5ea8
2021-07-27 17:33:10 +00:00
Evan Rosky
ffc00be4fb Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into sc-v2-dev am: 1e4d07fe1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348243

Change-Id: I879e388686d2433156d4ed00ce6576a835e84a57
2021-07-27 17:31:43 +00:00
Lucas Dupin
69eef091b4 Merge "Offload Luma Sampling IPC to background thread" into sc-v2-dev 2021-07-27 17:26:16 +00:00
Evan Rosky
1e4d07fe1f Merge "Add shell-transitions inTransition check to getTouchOcclusionMode" into sc-v2-dev 2021-07-27 17:11:26 +00:00
Julia Reynolds
6213e3cd8e Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77 am: 44d4056877
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660

Change-Id: Idb905a28c2152600bbf91ec3724508a2f4dd78a1
2021-07-27 16:47:26 +00:00
Julia Reynolds
44d4056877 Merge "Add NMS broadcasts to protected list" into sc-dev am: 92145ddf77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15393660

Change-Id: Ic1110f3618171322349346d017938c3248b7845a
2021-07-27 16:35:52 +00:00
Automerger Merge Worker
c20f6b17c8 Merge "Merge "Skip duplicate setBounds requests for task fragments" into sc-v2-dev am: 7d1040f716" into sc-v2-dev-plus-aosp 2021-07-27 16:32:11 +00:00
Jason Chang
80d8c55c1b Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80 am: 63f15d32dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: Ied857583e43fb2e0e68e19d158d6b48aa5261dd5
2021-07-27 16:31:35 +00:00
Andrii Kulian
f4e263606c Merge "Skip duplicate setBounds requests for task fragments" into sc-v2-dev am: 7d1040f716
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15364352

Change-Id: Ic6ffddeac35d9e8737a6689b5b930c3c007b612b
2021-07-27 16:31:34 +00:00
Chris Li
7f2ac96380 Merge "Hide Keyguard view after remote animation" into sc-v2-dev am: b2aca4718f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15365824

Change-Id: Ief1b1efa9c4d50e5ee193af1a4e2c53e71911727
2021-07-27 16:30:36 +00:00
Andrii Kulian
7d1040f716 Merge "Skip duplicate setBounds requests for task fragments" into sc-v2-dev 2021-07-27 16:21:25 +00:00
Julia Reynolds
92145ddf77 Merge "Add NMS broadcasts to protected list" into sc-dev 2021-07-27 16:16:53 +00:00
Jason Chang
63f15d32dd Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev am: 3ebd024a80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373613

Change-Id: I55abb1baa725c312038fb454f9a3737d88c13fe7
2021-07-27 16:12:56 +00:00
Chris Li
b2aca4718f Merge "Hide Keyguard view after remote animation" into sc-v2-dev 2021-07-27 16:08:27 +00:00
Jason Chang
3ebd024a80 Merge "Fix tutorial background color not up-to-date occasionally" into sc-dev 2021-07-27 16:00:30 +00:00
Peter Kalauskas
82eef5791f Merge "Move guest creation to background thread" into sc-dev am: 2599b29073 am: c2360bad51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286

Change-Id: I275b09f67cb2bc4bfa61f9c9f342b2cf3ed15396
2021-07-27 15:45:15 +00:00
Bill Yi
1668f74f1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours am: 97dc391718 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394508

Change-Id: Ibb88b16c142dfa8f6da006c73b28fed53bd91966
2021-07-27 15:45:02 +00:00
Peter Kalauskas
c2360bad51 Merge "Move guest creation to background thread" into sc-dev am: 2599b29073
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373286

Change-Id: I0165115ab9b76b27213de6eb7824fa9e63a6908e
2021-07-27 15:25:45 +00:00
Bill Yi
97dc391718 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours am: c78d905228 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394508

Change-Id: I1c0d22767cd2b00fe12f5b3aa18e4dc528d057a7
2021-07-27 15:25:17 +00:00
Peter Kalauskas
2599b29073 Merge "Move guest creation to background thread" into sc-dev 2021-07-27 15:19:05 +00:00
Jeff DeCew
0e7ef38722 Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db am: b744663f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213

Change-Id: Id759a4d31b15fb5dc0bb0990293dfd6fe6874c86
2021-07-27 15:16:16 +00:00
Sergey Volnov
8bcbf4b1ab Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de866 am: 04f0c39ce3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379071

Change-Id: I7f6883613700714aab10c453598ba95cb5e73929
2021-07-27 15:15:33 +00:00
Alex Buynytskyy
f0d0001aa7 Merge "Check for invalid (negative) string pool pos." into sc-dev am: 59bad728e2 am: 9336680fe5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390628

Change-Id: Iae777af3410b51509ff39c6619084a765909522d
2021-07-27 15:14:57 +00:00
Bill Yi
c78d905228 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 170f2b6287 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15394508

Change-Id: Ia293b6b9c509b8f7c5716badb3d056065e0aed5e
2021-07-27 15:09:11 +00:00
Jeff DeCew
b744663f9d Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15392213

Change-Id: Ief9db8b88ee36471affe960f247635f05c7768bb
2021-07-27 14:52:47 +00:00
Sergey Volnov
04f0c39ce3 Merge "Fix content capture not being usable from hotword detector." into sc-dev am: 78456de866
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15379071

Change-Id: Ic7db23b4c0c7a70b6fd79f3de9c5e2e0b5fd1045
2021-07-27 14:52:12 +00:00
Alex Buynytskyy
9336680fe5 Merge "Check for invalid (negative) string pool pos." into sc-dev am: 59bad728e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390628

Change-Id: Idcdd73f51cab13a188cf6391954662a3c74243b9
2021-07-27 14:51:48 +00:00
Jeff DeCew
44cd9995db Merge "Use correct stack height when bypass enabled." into sc-dev 2021-07-27 14:46:44 +00:00
Sergey Volnov
78456de866 Merge "Fix content capture not being usable from hotword detector." into sc-dev 2021-07-27 14:43:44 +00:00
Alex Buynytskyy
59bad728e2 Merge "Check for invalid (negative) string pool pos." into sc-dev 2021-07-27 14:39:29 +00:00
Amruth Ramachandran
5fa6815596 Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev am: 4afa9546f9 am: 33322518d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373617

Change-Id: I4be930fce6b8ebc58753b371dce99b582be03a7a
2021-07-27 14:18:29 +00:00
Amruth Ramachandran
33322518d2 Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev am: 4afa9546f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373617

Change-Id: Ibab5c2026307ff9d5ca89d6df10c5abaa7a763f7
2021-07-27 14:05:57 +00:00
Riddle Hsu
9f90c4ce81 Merge "Allow task fragment to use higher animation level" into sc-v2-dev am: 5df7e13286
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390760

Change-Id: If3b264f2e05b03c5ea01b18dfa0c7d29f4849c36
2021-07-27 13:48:28 +00:00
Amruth Ramachandran
4afa9546f9 Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev 2021-07-27 13:47:33 +00:00
Riddle Hsu
5df7e13286 Merge "Allow task fragment to use higher animation level" into sc-v2-dev 2021-07-27 13:35:34 +00:00
Bill Yi
170f2b6287 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I782fcfa347f70ae2745a058128f836463f39ed77
2021-07-27 13:08:56 +00:00
Sergey Volnov
eacb8c8aee Fix content capture not being usable from hotword detector.
Bug: 194534612
Test: local repro
Change-Id: I58e5c68ea486b4da2f82b9d89440f86a8d507727
2021-07-27 12:38:31 +01:00
Vadim Caen
bccc0b4fc7 Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68fd4 am: 733a7c94c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175437

Change-Id: Ie7081de77884e103ef18eee627ec99b7511becf3
2021-07-27 10:44:59 +00:00
Vadim Caen
733a7c94c5 Merge "Do not draw icon background if it shouldn't be seen" into sc-dev am: ee08a68fd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15175437

Change-Id: Icb38e71a17f5b143545622411a690ff8b2985638
2021-07-27 10:20:07 +00:00
Vadim Caen
ee08a68fd4 Merge "Do not draw icon background if it shouldn't be seen" into sc-dev 2021-07-27 10:05:17 +00:00
Rubin Xu
e9f958fb9a Merge "Stop managed profile owner granting READ_SMS" into sc-dev am: 28e4c5d57a am: d8c6203bec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371691

Change-Id: I1de8d392815f73f5e2ff2fd7dd0cb84180b7ec2a
2021-07-27 09:18:11 +00:00
Rubin Xu
d8c6203bec Merge "Stop managed profile owner granting READ_SMS" into sc-dev am: 28e4c5d57a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15371691

Change-Id: I352548279c31d182ff5bfb8c3fb4da41ddf53fb0
2021-07-27 09:05:46 +00:00
Nandana Dutt
f8d671f6f1 Merge "Note API alternatives in javadoc" into sc-v2-dev am: 138f08b5de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15390553

Change-Id: If7d9fc69b060bb9ff686c153329736f76d7f3063
2021-07-27 08:52:21 +00:00
Rubin Xu
28e4c5d57a Merge "Stop managed profile owner granting READ_SMS" into sc-dev 2021-07-27 08:51:15 +00:00
Nandana Dutt
138f08b5de Merge "Note API alternatives in javadoc" into sc-v2-dev 2021-07-27 08:38:15 +00:00
Tom Natan
7a09808f68 Merge "Add an 'android.software.app_compat_overrides' feature" into sc-v2-dev am: 3c3deaed91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328593

Change-Id: Ifac10503adc49a5c512c8a70d8dc9d6d4922bf41
2021-07-27 07:50:56 +00:00
Tom Natan
3c3deaed91 Merge "Add an 'android.software.app_compat_overrides' feature" into sc-v2-dev 2021-07-27 07:32:45 +00:00