Riddle Hsu
a752da8c80
Merge "Do not lock when calling startActivityFromRecents" into sc-v2-dev
2021-09-28 08:33:38 +00:00
PETER LIANG
c1fb8bb5d2
Merge changes from topic "max_height_a11y_illustration" into sc-v2-dev
...
* changes:
Extends to support the restricted setMaxHeight() for illustrationPreference.
Fix the bounds of the illustration view is larger than the background view in a foldable device.
2021-09-28 05:43:21 +00:00
Pablo Gamito
84afe777a1
Merge changes Ibd9f22af,Id42f5276 into sc-qpr1-dev am: e1841dc539
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897408
Change-Id: I373e1af0ccbeb47445d9cf7bddb1f6d62e6f7e85
2021-09-28 05:13:42 +00:00
Pablo Gamito
c877f28a09
[automerger skipped] Stop relying on background color attribute to set task transition background am: a5f3e90212 -s ours
...
am skip reason: Merged-In Id42f52760cb9a681c6c33f3c261d7db5e2f71af3 with SHA-1 c26db36f27 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897416
Change-Id: I912a9b3ecd3e318864adea07f3b064f01b2df22c
2021-09-28 05:13:40 +00:00
Pablo Gamito
e1841dc539
Merge changes Ibd9f22af,Id42f5276 into sc-qpr1-dev
...
* changes:
Revert "Add API to specify background color for animations"
Stop relying on background color attribute to set task transition background
2021-09-28 04:57:52 +00:00
Chris Li
9f8f87950e
Merge "Set animation layer for SurfaceFreezer leash" into sc-v2-dev
2021-09-28 03:50:28 +00:00
TreeHugger Robot
7cf888bac5
[automerger skipped] Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-qpr1-dev am: 16517d739d -s ours
...
am skip reason: Merged-In I0f681ccfe55597490bee0d4b190f9fb2c38e28f2 with SHA-1 cd755525c4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15923991
Change-Id: Ic71ecb2858dbebee6c169f8d629a5cd8cac2e1f0
2021-09-28 02:19:38 +00:00
TreeHugger Robot
16517d739d
Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-qpr1-dev
2021-09-28 02:08:27 +00:00
TreeHugger Robot
213a8d1137
Merge "Clean up the mLastSentTaskInfos entry" into sc-v2-dev
2021-09-28 01:41:37 +00:00
Jason Chang
94ec7e0d2a
Merge "Fix One-handed mode truncated screen when device rotates in multiple user mode" into sc-v2-dev
2021-09-28 00:09:09 +00:00
Pablo Gamito
66d4318c18
Revert "Add API to specify background color for animations"
...
This reverts commit 2ccc829e71 .
Reason for revert: No longer needed
Test: Existing tests
Bug: 200763116
Change-Id: Ibd9f22af05eba99c4509b503665c1e915993c940
2021-09-27 23:42:32 +02:00
Pablo Gamito
a5f3e90212
Stop relying on background color attribute to set task transition background
...
Because the background attribute used to have a different use some apps still set it and it means we could run transitions with unexpected background colors
Test: Existing
Fixes: 200763116
Merged-In: Id42f52760cb9a681c6c33f3c261d7db5e2f71af3
Change-Id: Id42f52760cb9a681c6c33f3c261d7db5e2f71af3
2021-09-27 23:42:15 +02:00
Joe Bolinger
3e68fa4904
Merge "Add dynamic color to side fps overlay." into sc-v2-dev
2021-09-27 20:47:46 +00:00
TreeHugger Robot
2db2bfd25e
Merge "Audio focus: make media fade out temporary" into sc-qpr1-dev am: cee2cddebe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15916332
Change-Id: I93d9a5a4414aaff389dcf6683071c3f84ec83061
2021-09-27 20:33:22 +00:00
TreeHugger Robot
cee2cddebe
Merge "Audio focus: make media fade out temporary" into sc-qpr1-dev
2021-09-27 20:07:52 +00:00
Pablo Gamito
ec0a575dfb
Merge "Stop relying on background color attribute to set task transition background" into sc-v2-dev
2021-09-27 19:57:41 +00:00
Caitlin Cassidy
83f1718952
[Ongoing Call] Remove the call chip when #onEntryCleanUp is called.
...
See bug comment #9 for an in-depth explanation.
Test: New unit tests.
Test: I created a test app that sends an ongoing call notification
then removes it 200ms later, and I confirmed that the bug is triggered
without this CL, and is fixed with this CL.
Bug: 199600334
Change-Id: I0f681ccfe55597490bee0d4b190f9fb2c38e28f2
(cherry picked from commit cd755525c4 )
Merged-In: I0f681ccfe55597490bee0d4b190f9fb2c38e28f2
2021-09-27 19:40:13 +00:00
TreeHugger Robot
8649b294c1
Merge "[Ongoing Call] Remove the call chip when #onEntryCleanUp is called." into sc-v2-dev
2021-09-27 19:21:50 +00:00
TreeHugger Robot
d8dd7323d2
[automerger skipped] Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-qpr1-dev am: 3a8df63e40 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15921184
Change-Id: Ic26c74527db6a2e15261f76ca33662cb15b8e432
2021-09-27 18:33:21 +00:00
TreeHugger Robot
3a8df63e40
Merge "[DO NOT MERGE] Smartspace - Don't create session ahead of init" into sc-qpr1-dev
2021-09-27 18:20:41 +00:00
Josh Tsuji
82214e172e
Merge "Add windowIsFloating to the volume dialog to fix insets issues." into sc-qpr1-dev am: f234de508d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15909680
Change-Id: I88fe6a6eca7f6b18a039368337819d1ef426c76b
2021-09-27 17:36:32 +00:00
Josh Tsuji
f234de508d
Merge "Add windowIsFloating to the volume dialog to fix insets issues." into sc-qpr1-dev
2021-09-27 17:21:08 +00:00
Bill Yi
d1a394665c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6e3c154990 -s ours am: 609258f83d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918185
Change-Id: I21340e25a11b65ab045301c59c08a85c2314cdf6
2021-09-27 16:18:47 +00:00
Bill Yi
6cea51c98e
Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into sc-qpr1-dev am: 64799a586f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918185
Change-Id: Ib1ae20259ae36aefc1c0fbad87eb4c81390944ee
2021-09-27 16:18:39 +00:00
Bill Yi
788c5ad321
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4a8bd31415 am: 62a22df5ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918185
Change-Id: Icb4feee860d81ca052efd42c58dc802915786066
2021-09-27 16:18:38 +00:00
Bill Yi
217c452c7f
Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-qpr1-dev am: 33d52c3daf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915585
Change-Id: I3765e09397c76afd5fe382391f856b8b4e457c98
2021-09-27 16:18:18 +00:00
Bill Yi
6bd49841dd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3820a903ef am: de564993c1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915585
Change-Id: I3b4d35c97d89dd2a3264721012f9837aed68491c
2021-09-27 16:18:16 +00:00
Pablo Gamito
b5a1c65a8f
[automerger skipped] Merge "Remove uses of background color attribute" into sc-qpr1-dev am: d0561dcae0 -s ours
...
am skip reason: Merged-In Iee395289ecd108327fa2acc23d19059b50f52822 with SHA-1 e11ecf0c3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897415
Change-Id: Idb52dc35823ca838abf82ac3109ff5017c0a94e9
2021-09-27 16:17:58 +00:00
TreeHugger Robot
ceaa221c97
[automerger skipped] Merge "Update clock burn-in so it doesn't clash with udpfs" into sc-qpr1-dev am: d58d6bfd38 -s ours
...
am skip reason: Merged-In I6f95fe3ad763971b804129b517f4c98192ab3674 with SHA-1 9b62051f88 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853618
Change-Id: I8ea4bdd094555484e87ed8726f20973258a65286
2021-09-27 16:17:50 +00:00
TreeHugger Robot
ed5109692a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8e2e404d53 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918186
Change-Id: I0c5fd017d830206142eb7422a18ef573780f0b48
2021-09-27 16:17:43 +00:00
TreeHugger Robot
82780dd0df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 36be44facb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918189
Change-Id: If062f4daae2cb404f4b7cafdfa8cfcb300038bed
2021-09-27 16:17:30 +00:00
TreeHugger Robot
478eae4a93
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 69cba5cad9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915586
Change-Id: I7430042812718c64c78f9652004f18a7a41c6089
2021-09-27 16:17:21 +00:00
Joanne Chung
69d90b08b1
Set interaction boost for voice sessions. am: 02ccd62d0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15837927
Change-Id: I3273d455ea315bfb66b6072f1a9b69c2e24b31b7
2021-09-27 16:17:15 +00:00
TreeHugger Robot
7cd0f0dd0d
[automerger skipped] Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev am: d92e142ac4 am: 9e310df136 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888530
Change-Id: Id8344731c215ac22c3ebc38fc7917b9813734945
2021-09-27 16:17:10 +00:00
Ming-Shin Lu
4a8fbc65da
[automerger skipped] RESTRICT AUTOMERGE: More improve IME transition during task switch am: 5c23301322 am: 1fb73329b8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888530
Change-Id: Ibde552dfbdfdf0c8d86583d723d198f56c7c2a34
2021-09-27 16:17:08 +00:00
Zoey Chen
e8d941fcbf
Merge "[Provider Model] Should show LTE instead of LTE+" into sc-qpr1-dev am: a546852117
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903066
Change-Id: Iecece435adc76418f60351a2676b91f5e8e2b164
2021-09-27 16:17:00 +00:00
TreeHugger Robot
68bc4b4279
[automerger skipped] Merge "Use orientation value from config change event" into sc-qpr1-dev am: 483f6eb47c -s ours
...
am skip reason: Merged-In Icd15712cd4821b7833a3373978a92f8b5959ac12 with SHA-1 7764837004 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15889882
Change-Id: Ida2cb2c8f51e03ad0410a2abb5615fe7117554e3
2021-09-27 16:16:50 +00:00
Bill Yi
69fe5bfda6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8cb6e80e2d -s ours am: 26eec47dc1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901081
Change-Id: I53bec891e6835beeb330fe95468f3e1e80bdebb9
2021-09-27 16:16:44 +00:00
Bill Yi
b507a5eb4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d73fcd72c3 -s ours am: 76d64e87db -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903068
Change-Id: I645c7d7916289b95e0945c911f15009d17561fba
2021-09-27 16:16:37 +00:00
Bill Yi
a8e8c7cf39
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 24f4aada7a -s ours am: 1b0a894667 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897823
Change-Id: I0885fca8c28288bd2a265cc08c13d36a15c81daf
2021-09-27 16:16:29 +00:00
Bill Yi
cd01fbb035
Merge changes from topic "presubmit-am-22095588cfca4cccb6de704ccd95f743" into sc-qpr1-dev am: 50f102045e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901081
Change-Id: Ia1fd07726b829d374f17d088c02c8528bbfc6140
2021-09-27 16:16:19 +00:00
Bill Yi
c5ad82385a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 063bcacc7a am: ef9fc04a1a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901081
Change-Id: I649cd4ac2d9fe641cfa875b0eb5c0271cd3c3cf0
2021-09-27 16:16:17 +00:00
Bill Yi
a2d77332e5
Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-qpr1-dev am: 8d220a98c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903068
Change-Id: I041bfac654fc27c9af19c57c10f3aedeca4b684c
2021-09-27 16:14:16 +00:00
Bill Yi
a2d8a70d62
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c2a77f598 am: aa2d5a7bce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903068
Change-Id: I54bfbee8c3b332f5d048febb9a5f25aaeb8b173e
2021-09-27 16:14:14 +00:00
Bill Yi
1fe5398d5f
Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into sc-qpr1-dev am: b76e82c434
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897823
Change-Id: I95224ac7a23e2878bc889276cbebfe7736d8b34a
2021-09-27 16:13:55 +00:00
Bill Yi
55e22e598f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70fd54fa14 am: 36b3b15db5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897823
Change-Id: I11bb3b97437cd3cece9a720fe849e824c01a393a
2021-09-27 16:13:54 +00:00
Bill Yi
7f9a8784ea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 939547f7f5 -s ours am: e2871ab0ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898290
Change-Id: I26f0c749765ca9fe03e6ba5c98538ae9cd3e12c2
2021-09-27 16:13:45 +00:00
TreeHugger Robot
80eecd591b
Merge "[Provider Model] Fix QS internet Panel accessibility issues" into sc-qpr1-dev am: 01e6e5780b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898229
Change-Id: I5d19102526bc767adebb52b8224a3ae20d9f9164
2021-09-27 16:13:37 +00:00
Bill Yi
173beff9b0
Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into sc-qpr1-dev am: b0db165d7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898290
Change-Id: I7671f46a8ac0602db8cd16127b1fcc723721f83c
2021-09-27 16:13:25 +00:00
Bill Yi
457f4e3130
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 060aa2513b am: cede4b3b7a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898290
Change-Id: I0e905c3cdff3a3be823d89d5e80817042a4dc8e9
2021-09-27 16:13:23 +00:00