Commit Graph

658017 Commits

Author SHA1 Message Date
Jay Aliomer
fd695493a1 Merge "Notification footer shows when there are zero notifications" into sc-dev am: 5b0cad9991 am: 978426cdbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15095468

Change-Id: I91cb0d5067952f4f357c825d517e64254a3b67d5
2021-07-06 19:01:35 +00:00
Jay Aliomer
978426cdbc Merge "Notification footer shows when there are zero notifications" into sc-dev am: 5b0cad9991
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15095468

Change-Id: I962c15d0c7b7333b45446104ca9e3cbfcb2eb647
2021-07-06 18:44:28 +00:00
Jay Aliomer
5b0cad9991 Merge "Notification footer shows when there are zero notifications" into sc-dev 2021-07-06 18:32:31 +00:00
Jay Aliomer
3b6a3ecb25 Notification footer shows when there are zero notifications
Fixes: 191960604
Test: visual
Change-Id: Ib4b41890b6a0eb7e9b445b64c30b500eebc1a52f
2021-07-06 18:32:11 +00:00
Tom Natan
e881cddf7a Merge "[DO NOT MERGE] add OWNERS file to new compat.overrides sub-package" into sc-v2-dev am: 7d2d139462
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15208801

Change-Id: I0c4eaecdeaebf33f6d34c55b9207781ca7f65ffe
2021-07-06 14:13:12 +00:00
tomnatan
ec28c99e1b [DO NOT MERGE] add OWNERS file to new compat.overrides sub-package am: b20baf4fae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15208801

Change-Id: I5351548a0baacfbbdc57c450fc08631f9648b711
2021-07-06 14:12:51 +00:00
Tom Natan
7d2d139462 Merge "[DO NOT MERGE] add OWNERS file to new compat.overrides sub-package" into sc-v2-dev 2021-07-06 13:58:26 +00:00
Fiona Campbell
7e47a4b8ae Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev am: 5fa180d64a am: c1e105bb95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15108421

Change-Id: I20430230c5cd25e0099ae8a9ade1700a74fe93ca
2021-07-06 12:52:38 +00:00
Fiona Campbell
68b53cbba1 Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev am: 5fa180d64a am: fbdb7a3f5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15108421

Change-Id: I8cc6b278df028374f43eb6e520f0a379fe52139f
2021-07-06 12:52:09 +00:00
Fiona Campbell
fbdb7a3f5b Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev am: 5fa180d64a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15108421

Change-Id: Id9733ff024ce74f60092a1ae6328c5fd61ca3311
2021-07-06 12:38:13 +00:00
Fiona Campbell
c1e105bb95 Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev am: 5fa180d64a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15108421

Change-Id: Ic79eb81b6df71f221a1bcfba28b82f37e219b07f
2021-07-06 12:37:36 +00:00
Fiona Campbell
5fa180d64a Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev 2021-07-06 12:24:32 +00:00
Riddle Hsu
c02fca0481 Merge "Fix NPE caused by config change on a destroyed activity" into sc-v2-dev am: ee37f56c37
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15183789

Change-Id: I8dcf3e24e13cb89ed9f48049ee3fa6b9ae172200
2021-07-06 12:15:37 +00:00
Riddle Hsu
ee37f56c37 Merge "Fix NPE caused by config change on a destroyed activity" into sc-v2-dev 2021-07-06 11:59:57 +00:00
tomnatan
b20baf4fae [DO NOT MERGE] add OWNERS file to new compat.overrides sub-package
This package will host the service that applies per-app compat
overrides.

Bug: 190024878
Test: none
Change-Id: I2d875c8fa9028b6940124e78dd5d581e5b87e26d
2021-07-06 11:53:16 +00:00
Tom Natan
89f92d8537 Merge "add OWNERS file to new compat.overrides sub- package" am: a30c27e884 am: e6484145d7 am: 8dba45779c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755270

Change-Id: I5d045f8124fda9c25ec849498eaa526402527165
2021-07-06 09:55:09 +00:00
Tom Natan
8dba45779c Merge "add OWNERS file to new compat.overrides sub- package" am: a30c27e884 am: e6484145d7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755270

Change-Id: I153512819a03835c35b7da45985337504220e112
2021-07-06 09:38:21 +00:00
Tom Natan
e6484145d7 Merge "add OWNERS file to new compat.overrides sub- package" am: a30c27e884
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755270

Change-Id: I22b42dc10aa677e644d53d228457c38144f88476
2021-07-06 09:28:50 +00:00
Tom Natan
a30c27e884 Merge "add OWNERS file to new compat.overrides sub- package" 2021-07-06 09:14:48 +00:00
Louis Chang
569d571076 Merge "Fix black screen after moving top activity to another display" into sc-v2-dev am: 8e851faf70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15184579

Change-Id: I40f6c0110f37f01cb1e9a1f08610beb1271f8f48
2021-07-06 07:23:46 +00:00
Louis Chang
8e851faf70 Merge "Fix black screen after moving top activity to another display" into sc-v2-dev 2021-07-06 07:06:18 +00:00
TreeHugger Robot
1933a37816 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours am: 226f1ac296 -s ours am: cb977a8e8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8967b9c5a04e898ff5a810f644418fda5c7e84d
2021-07-06 06:07:24 +00:00
TreeHugger Robot
cce9dabfa9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 040fac27fa -s ours am: d8c366637a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc1ef59735660d8b1cc93bdc86a51613ba72b08c
2021-07-06 06:07:10 +00:00
TreeHugger Robot
7609db7e24 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours am: 226f1ac296 -s ours am: ac9b41fe6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06af8bfb28e2e6263e67cf02f0a4d2c8728888c7
2021-07-06 05:53:16 +00:00
TreeHugger Robot
3590d72ba1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 040fac27fa -s ours am: 022e5f2ec0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7454da84196fb342a18e46213a5409652b998c4
2021-07-06 05:53:07 +00:00
TreeHugger Robot
ac9b41fe6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours am: 226f1ac296 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c584e9fdaf9ca5734b8e44c179f9aff843fbe43
2021-07-06 05:46:33 +00:00
TreeHugger Robot
cb977a8e8d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours am: 226f1ac296 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief8a590ca910a2cd33510e3f71bad1ab633762c6
2021-07-06 05:43:34 +00:00
TreeHugger Robot
d8c366637a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 040fac27fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5603090ce7928380e15b981f80c44faf82ba93fb
2021-07-06 05:43:29 +00:00
TreeHugger Robot
022e5f2ec0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 040fac27fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0206fab49a2a731bac5e65d6f3a7fc24492bee3a
2021-07-06 05:42:55 +00:00
TreeHugger Robot
226f1ac296 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6188def997 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaac2891bff9dc294c676d3a5df138b836e5328a4
2021-07-06 05:42:32 +00:00
TreeHugger Robot
0af8ec20a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 93e7b8c2e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b9c049b797b0b505c23e4da3b45f530ff6579fc
2021-07-06 05:34:32 +00:00
TreeHugger Robot
52e5996b4e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 09b86aa6e6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib585f4af2e8c2fab8d762c065b45c94e7c60273b
2021-07-06 05:33:45 +00:00
TreeHugger Robot
040fac27fa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-06 05:32:43 +00:00
TreeHugger Robot
6188def997 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-06 05:32:33 +00:00
TreeHugger Robot
93e7b8c2e3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-06 05:21:03 +00:00
TreeHugger Robot
09b86aa6e6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-06 05:18:04 +00:00
Jacky Kao
a23414460d Merge "Reset the features in A11yInputFilter per display" into sc-v2-dev am: f5cd3171a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15208876

Change-Id: I5b3746969ef916da2b2a981a35ab6ae583c8c876
2021-07-06 05:09:27 +00:00
Jacky Kao
f5cd3171a3 Merge "Reset the features in A11yInputFilter per display" into sc-v2-dev 2021-07-06 04:58:27 +00:00
Riddle Hsu
9a2454c595 Fix NPE caused by config change on a destroyed activity
The config callback from view root may not know the state
of activity. That may trigger a stale callback, so
 - Restore the null check when getting mSizeConfigurations.
 - Clear the callback if the activity will be removed.

Bug: 192603207
Test: ActivityLifecycleTopResumedStateTests
Change-Id: I17ea8fc2ba994f630d5ad7baa3de298d90a32827
2021-07-06 12:36:39 +08:00
Louis Chang
5063db3b73 Fix black screen after moving top activity to another display
The screen was black after moving the top activity to another display.
The next top activity did not be resumed and was still invisible. The
regression was from bebd8cd, which incidentally reverse the condition.

Since the case of removing a display is already handled by 402b440,
#postReparent is not needed to call again in #reparent (when display
is removing).

Fixing the issue forward by resuming the focusable task in
#moveRootTaskToTaskDisplayArea.

Bug: 192616155
Test: atest ActivityTaskManagerServiceTests
Change-Id: Id0971ad8a1c692fdb5376e2c077faa6f00dd61ac
2021-07-06 11:10:55 +08:00
Riddle Hsu
e17d9ee4d4 Merge "Temporarily increase sched policy for dozing" into sc-dev am: 750d0ebd3f am: 5d9e8eaaf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160790

Change-Id: I6d52178feaefd1261ee4639808c057722eb24106
2021-07-06 03:02:43 +00:00
TreeHugger Robot
d157ff0582 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d6540af794 -s ours am: 49798854ff -s ours am: c31605e8a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21d469b80d0a4f6444d7ff22ba8a9ab02ed4ab66
2021-07-06 03:02:35 +00:00
Riddle Hsu
2212849531 Merge "Temporarily increase sched policy for dozing" into sc-dev am: 750d0ebd3f am: c72624e4d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160790

Change-Id: I9b74e9757aae4a77920a7bd48cf63d107114c835
2021-07-06 03:02:25 +00:00
TreeHugger Robot
fdeebd0eb2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d6540af794 -s ours am: 49798854ff -s ours am: d63445360a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebf425f90516ac98cb3f00d7e10d19f354c720a2
2021-07-06 03:02:02 +00:00
Riddle Hsu
c72624e4d1 Merge "Temporarily increase sched policy for dozing" into sc-dev am: 750d0ebd3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160790

Change-Id: Ica0f99ab900eaa94e51be4855e5a5495a45865d2
2021-07-06 02:50:20 +00:00
TreeHugger Robot
d63445360a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d6540af794 -s ours am: 49798854ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffc5b642cb810caddbf69f6e4f6dbfced363e432
2021-07-06 02:50:15 +00:00
Riddle Hsu
5d9e8eaaf5 Merge "Temporarily increase sched policy for dozing" into sc-dev am: 750d0ebd3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160790

Change-Id: Id295e717dba9f74d24ba8b8d91dc1562949c6092
2021-07-06 02:49:42 +00:00
TreeHugger Robot
c31605e8a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d6540af794 -s ours am: 49798854ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42cdb465c89177c16e68fc09ef76998d1a06d47b
2021-07-06 02:49:18 +00:00
Riddle Hsu
750d0ebd3f Merge "Temporarily increase sched policy for dozing" into sc-dev 2021-07-06 02:46:36 +00:00
TreeHugger Robot
49798854ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d6540af794 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba43ae2b52510282ab1ecea4ac748a3ef596ccbb
2021-07-06 02:37:26 +00:00