Lucas Dupin
c1467b6fba
Merge "Fixes two bright flashes of the notification scrim" into sc-dev am: 54a6622179
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638438
Change-Id: Iff9a7e40db36f7916f68d7572c14e2c27a0e29fe
2021-08-21 17:08:57 +00:00
Lucas Dupin
54a6622179
Merge "Fixes two bright flashes of the notification scrim" into sc-dev
2021-08-21 16:54:08 +00:00
Bill Yi
de5a16d91b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4867b53d53 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641074
Change-Id: I6361af4897b919704c0fc8a6f90c114cce1c4c59
2021-08-21 03:52:11 +00:00
Bill Yi
c94a6030ea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b2408c5bb8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643960
Change-Id: I00627059a6c71abd44dc45e5a2fe0cd1775b2a44
2021-08-21 03:51:45 +00:00
Bill Yi
75f9361373
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 52e6316206 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640453
Change-Id: I93f5bd4cf9efaadbf5a3fda1a2a91a66ef123810
2021-08-21 03:50:41 +00:00
Bill Yi
4867b53d53
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-21 03:37:21 +00:00
Bill Yi
aff179b0f4
Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 36e50b369a
Import translations. DO NOT MERGE ANYWHERE
2021-08-21 03:37:21 +00:00
Bill Yi
b2408c5bb8
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-21 03:36:52 +00:00
Bill Yi
66f5690f0e
Merge changes from topic "presubmit-am-d779dce131b641afa9cae2d4523c3036" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d2355844f
Import translations. DO NOT MERGE ANYWHERE
2021-08-21 03:36:52 +00:00
Bill Yi
52e6316206
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-21 03:35:48 +00:00
Bill Yi
1413252793
Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b41b612850
Import translations. DO NOT MERGE ANYWHERE
2021-08-21 03:35:48 +00:00
TreeHugger Robot
a78a499104
[automerger skipped] Merge "Add a system api to fetch uuids by the specific transport" into stage-aosp-master am: 572ad262cb -s ours
...
am skip reason: Merged-In I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a with SHA-1 d4a2b02a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640716
Change-Id: Icee9dcd2d38383069b3372f77fdf56940ec0bbe7
2021-08-21 00:31:23 +00:00
TreeHugger Robot
572ad262cb
Merge "Add a system api to fetch uuids by the specific transport" into stage-aosp-master
2021-08-21 00:28:34 +00:00
TreeHugger Robot
be878306ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bc336f502f -s ours am: 095c6a7869 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638294
Change-Id: I107d1eb95e90e78ba800c273f9d648b1d64e3797
2021-08-21 00:03:23 +00:00
TreeHugger Robot
095c6a7869
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bc336f502f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638294
Change-Id: Ic4cf2e404f270a6c50ab96cd1277657a1f57ccc2
2021-08-20 23:48:18 +00:00
TreeHugger Robot
bc336f502f
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-20 23:32:20 +00:00
TreeHugger Robot
0672f616e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d54097d3da -s ours am: 2fcccb7771 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643363
Change-Id: If6ad38bc9c97c9cdb91e4a837fb1511e483df276
2021-08-20 23:26:44 +00:00
Bill Yi
e4d21c07f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a132116bc -s ours am: 196033d815 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641947
Change-Id: Ia6c6bc3af77aa7a3cb70cec63b253b9d3b6d07d3
2021-08-20 23:26:31 +00:00
TreeHugger Robot
2fcccb7771
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d54097d3da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643363
Change-Id: I14dbcd887f0251b3c487a34678c367c9914bf3aa
2021-08-20 23:15:59 +00:00
Bill Yi
196033d815
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a132116bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641947
Change-Id: I8da2ca9757bcad00674546cd7eb9dc3258e4ff32
2021-08-20 23:15:40 +00:00
TreeHugger Robot
d54097d3da
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-20 23:01:19 +00:00
Bill Yi
ded961b5b9
Import translations. DO NOT MERGE ANYWHERE
...
BUG:197363645
Auto-generated-cl: translation import
Change-Id: If7d80129a4cfadf74d6c97d5dbac634ea184678f
2021-08-20 23:01:10 +00:00
Bill Yi
4a132116bc
Import translations. DO NOT MERGE ANYWHERE
...
BUG:197363645
Auto-generated-cl: translation import
Change-Id: I7b107bb78c094f135b12d1da3eb2fe8e41cb61e8
2021-08-20 23:00:16 +00:00
Bill Yi
891fe52287
Import translations. DO NOT MERGE ANYWHERE
...
BUG:197363645
Auto-generated-cl: translation import
Change-Id: Ia565a1a0608daba71262dbea69815e859abcbf79
2021-08-20 22:59:50 +00:00
TreeHugger Robot
2c97aa8381
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e82d791fd5 -s ours am: 75609965af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641073
Change-Id: I4ad404373a523fa0f22a1caf2d3faacf20d5b510
2021-08-20 22:27:26 +00:00
TreeHugger Robot
572e22c01f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 681902373f -s ours am: 82d55973d5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643359
Change-Id: I7401da33fe49a7468946b952c208851c310125bb
2021-08-20 22:27:21 +00:00
Bill Yi
b7fb1a7ce3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3c9c23ee9 -s ours am: 9ac3b7accb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15639360
Change-Id: Ie470a2b01deeb7f55e21711ec514e09396c7fa65
2021-08-20 22:27:00 +00:00
TreeHugger Robot
75609965af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e82d791fd5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641073
Change-Id: I728c7905f7015309be854ecbf8519ab8182d688d
2021-08-20 22:23:17 +00:00
TreeHugger Robot
82d55973d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 681902373f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643359
Change-Id: I4e7e97f55751ce0120c1937a2c1c876ecf68620c
2021-08-20 22:19:12 +00:00
Bill Yi
9ac3b7accb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c3c9c23ee9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15639360
Change-Id: I7d68a496a836846f1e11ca35bf29ded3d8a8ae38
2021-08-20 22:09:46 +00:00
TreeHugger Robot
e82d791fd5
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-08-20 22:00:34 +00:00
TreeHugger Robot
681902373f
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-08-20 22:00:11 +00:00
Bill Yi
3e11407bb9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6d2355844f
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643960
Change-Id: Ic65953056db68f209c1036254ff8387391f9eb30
2021-08-20 21:24:38 +00:00
Bill Yi
6d2355844f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie42c1ee5b12edbd8ffc63ac257d439935f0864b7
2021-08-20 21:24:23 +00:00
Bill Yi
c5fbcef773
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8810cd9ff1c4b00ff2a8555f635f72c7cf6b4213
2021-08-20 20:51:03 +00:00
Bill Yi
2aaf020ba9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 36e50b369a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15641074
Change-Id: I1d27dece593ba201e02b88bb17494a9346090e79
2021-08-20 20:10:39 +00:00
Bill Yi
36e50b369a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iea6efab45953d8685dc35fe8ae0d8b7d414dcfae
2021-08-20 20:10:09 +00:00
Bill Yi
cd7a384e6c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f757df96cf877451fe399b6747143c6e17fd86f
2021-08-20 20:03:11 +00:00
Santiago Seifert
8b0842cbbb
Merge "Clean up ownership in frameworks/base/" am: c875fc5613 am: afc4d064cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1804116
Change-Id: I5efb2a3ab963f7d8f2b9a485290508dc918f769c
2021-08-20 17:05:59 +00:00
Santiago Seifert
afc4d064cc
Merge "Clean up ownership in frameworks/base/" am: c875fc5613
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1804116
Change-Id: I14566099250b2630a4146abd47862585e5e52fa1
2021-08-20 16:44:26 +00:00
Bill Yi
349bae939e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b41b612850
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640453
Change-Id: Id70a2975c6813545be61f73423e69597d858fed5
2021-08-20 16:32:13 +00:00
Bill Yi
b41b612850
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9bfddf2c8ef37ceaf76d6e07ad80937039a1d735
2021-08-20 16:31:54 +00:00
Santiago Seifert
c875fc5613
Merge "Clean up ownership in frameworks/base/"
2021-08-20 16:29:34 +00:00
Alice Kuo
21ff734712
Add a system api to fetch uuids by the specific transport
...
The functionality is similar with fetchUuidsWithSdp which uses TRANSPORT_AUTO. Bt stack depends on the devie type and address type to do sdp or gatt service discovery. Add an api to specific the transport. It would be fexible to handle the dual mode device.
Ignore-AOSP-First: avoid merge conflict
Tag: #feature
Bug: 194447999
Test: atest BluetoothInstrumentationTests
Test: Take two headphone to test the dual mode behavior
Change-Id: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
Merged-In: I32c8dde68969e0bdc42e4e898c43a4f2c1d3379a
2021-08-20 16:26:24 +00:00
Selim Cinek
ee48cd0962
Fixes two bright flashes of the notification scrim
...
We were previously going to UNLOCKED state if if there was no camera
preview leading to a bright flash in light mode. we now only do this
when the whole screen is obscured anyway by the camera preview.
This also fixes another scrim issue where the unocclusion would
flash the notification scrim, because it's expanding, which
usually shows the bouncer with a bright background during the
expansion.
Test: atest SystemUITests
Fixes: 197160246
Merged-In: I418e878698c2606856b93faf774cd87830773815
Change-Id: I418e878698c2606856b93faf774cd87830773815
2021-08-20 15:57:29 +00:00
Bill Yi
c3c9c23ee9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I356d19ea325a38601a72e1470d8644d9dd483fa2
2021-08-20 15:09:02 +00:00
Santiago Seifert
432e98eb50
Clean up ownership in frameworks/base/
...
Bug: 197217250
Change-Id: I04bee764bf50734523ff2210d30ed052dcb036bd
Test: No code changes done.
2021-08-20 13:59:15 +00:00
Treehugger Robot
3950828ac0
Merge "Add SharedMemory.fromFileDescriptor" am: d079236881 am: b2cb2c7994
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775625
Change-Id: I89ba19ee1cbbbd25508c5b1f8f1ae77e85d81cd5
2021-08-20 05:28:12 +00:00
Treehugger Robot
b2cb2c7994
Merge "Add SharedMemory.fromFileDescriptor" am: d079236881
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775625
Change-Id: I5464155029ddbc1e8391ae1717bbc91cb48522a3
2021-08-20 05:08:13 +00:00
Treehugger Robot
d079236881
Merge "Add SharedMemory.fromFileDescriptor"
2021-08-20 04:50:26 +00:00