Commit Graph

772154 Commits

Author SHA1 Message Date
Chavi Weingarten
ea4ccf8a1c Merge "Set mSyncBuffer to true when VRI did not initiate the sync request" into tm-dev am: 700cdec45b am: 540019ef2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17746204

Change-Id: Ib1b400dd26c79f92a533136e2c9a29dcad10ee4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 14:55:18 +00:00
Victor Truong
f7c8497b22 Merge "Resize dream clock to match UX specs." into tm-dev am: ad97faab28 am: 721ae18faf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745377

Change-Id: I9be242806365b21976ba857f133ec6910b3c9ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 14:53:16 +00:00
Rasheed Lewis
929cfd89cb Merge "Replaced Quick Settings Auto-Rotate Icons to Use Animations" into tm-qpr-dev am: e75676adfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745166

Change-Id: I921f466bb284e90893b953324416b0d510084497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 14:38:29 +00:00
Chavi Weingarten
540019ef2c Merge "Set mSyncBuffer to true when VRI did not initiate the sync request" into tm-dev am: 700cdec45b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17746204

Change-Id: I4999f9a517d9ac89ae8a58aadf05e3fd95933c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 14:32:45 +00:00
Victor Truong
721ae18faf Merge "Resize dream clock to match UX specs." into tm-dev am: ad97faab28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745377

Change-Id: Ib0f6d1a9998e686dfc27a5b0287708ced5a82699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 14:31:42 +00:00
Rasheed Lewis
e75676adfe Merge "Replaced Quick Settings Auto-Rotate Icons to Use Animations" into tm-qpr-dev 2022-04-14 14:21:06 +00:00
Chavi Weingarten
700cdec45b Merge "Set mSyncBuffer to true when VRI did not initiate the sync request" into tm-dev 2022-04-14 14:19:43 +00:00
TreeHugger Robot
94c8307a5f [automerger skipped] Merge "Fix media_session shell commands" into tm-dev am: 63104b024e am: b08a6f51da am: f40cb06f8e -s ours
am skip reason: Merged-In Ie3cee37689ca2be30c522c1439afd5e6dde374e1 with SHA-1 12b2d2c768 is already in history

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

Change-Id: Ib35ef16d433b68567ab3910d8b3343a9966af01e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 14:00:02 +00:00
Victor Truong
ad97faab28 Merge "Resize dream clock to match UX specs." into tm-dev 2022-04-14 13:56:42 +00:00
TreeHugger Robot
f40cb06f8e Merge "Fix media_session shell commands" into tm-dev am: 63104b024e am: b08a6f51da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745120

Change-Id: I57fa963eee03de3a87077b34e26ab19e0b0ec7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 13:38:58 +00:00
TreeHugger Robot
11a5eb1645 [automerger skipped] Merge "Fix media_session shell commands" into tm-dev am: 63104b024e am: 264a6eadeb -s ours
am skip reason: Merged-In Ie3cee37689ca2be30c522c1439afd5e6dde374e1 with SHA-1 5f18e7a7fc is already in history

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

Change-Id: I10087fd974509820d8845d5533d238e6164dd9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 13:38:20 +00:00
TreeHugger Robot
b08a6f51da Merge "Fix media_session shell commands" into tm-dev am: 63104b024e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745120

Change-Id: I959cf3210d43fd113e2d439bb2ae705473a1e658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 13:17:44 +00:00
TreeHugger Robot
264a6eadeb Merge "Fix media_session shell commands" into tm-dev am: 63104b024e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17745120

Change-Id: Ic6b5b5addc29b5e85ab51d22a842122cd5c48633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 13:16:55 +00:00
Justin Weir
e1b9bf243e Merge changes from topic "b221419865" into tm-dev am: 4682c6576c am: 6b4f3a7474 am: ce5eede62b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592154

Change-Id: Ia801127ee1f4cefc2cd16d89d15bff607bdef768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 13:03:48 +00:00
Justin Weir
4b28265e73 Merge changes from topic "b224749799" into tm-dev am: 123c1b0954 am: 7325f79b04 am: b338a45087
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17723163

Change-Id: I5f6b249728eb490374aa293c51ee43ed61b40122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 13:02:22 +00:00
TreeHugger Robot
63104b024e Merge "Fix media_session shell commands" into tm-dev 2022-04-14 12:56:48 +00:00
Justin Weir
99c6947957 Merge changes from topic "b221419865" into tm-dev am: 4682c6576c am: 0b6a8613e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592154

Change-Id: I6a0373e6ee76d29fe1017248a89de5b6c129d28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 12:15:26 +00:00
Justin Weir
ce5eede62b Merge changes from topic "b221419865" into tm-dev am: 4682c6576c am: 6b4f3a7474
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592154

Change-Id: Ic6df49ce50e77501868750225667947ef7d6b85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 12:15:14 +00:00
Justin Weir
b338a45087 Merge changes from topic "b224749799" into tm-dev am: 123c1b0954 am: 7325f79b04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17723163

Change-Id: I024ff1c3dfba0fe10ae48b085206565c469b0c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 12:15:07 +00:00
Justin Weir
2fa5169aae Merge changes from topic "b224749799" into tm-dev am: 123c1b0954 am: 030d601025
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17723163

Change-Id: I34717713f104beca253b203d671e7de339115495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 12:14:38 +00:00
Pavel Grafov
6787fb85a9 Merge "Remove fossilized upgrade code." into tm-dev am: c291627ea9 am: 4bb26ef6b0 am: cb5deeeead
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591526

Change-Id: I656aa25abf2c34e0ba2955335a39f5b61bcd6913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:54:19 +00:00
Mark Renouf
e67d5e5cb5 Merge "Explicitly allow access to share targets by package" into tm-dev am: 09f39ec2fd am: e96155bd5a am: c5e6057a7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17669233

Change-Id: I1b30710f28ef51213b066e4b49c75ce92f01c925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:53:41 +00:00
TreeHugger Robot
881649a35c Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev am: ca1f7d88d4 am: 60c6c2be2d am: 34b6fb54ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730691

Change-Id: I70f55dccfe07dee1936ae8cfe0c13fd874bd3626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:52:00 +00:00
Justin Weir
6b4f3a7474 Merge changes from topic "b221419865" into tm-dev am: 4682c6576c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592154

Change-Id: Ifef7e44b3bdc14b50bcf99e4587cc2e32ca2a52c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:50:38 +00:00
Chris Li
00ccd2a2ed Merge "Notify organizer when the last activity in TaskFragment enter PiP" into tm-dev am: 88671a050f am: 38f42547e4 am: 251d7fdf2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17713423

Change-Id: I64beda373e728d27503ec334f6c53a3abd892184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:50:21 +00:00
Justin Weir
0b6a8613e0 Merge changes from topic "b221419865" into tm-dev am: 4682c6576c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592154

Change-Id: I2181637c7101f2dba7bb077cb8d06193c05bcc1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:50:05 +00:00
Justin Weir
7325f79b04 Merge changes from topic "b224749799" into tm-dev am: 123c1b0954
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17723163

Change-Id: I4e518a96980593f4984661af8715b683ac6eb20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:50:00 +00:00
Justin Weir
030d601025 Merge changes from topic "b224749799" into tm-dev am: 123c1b0954
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17723163

Change-Id: I4e4469dc5d2f8c006fd1130d9ea122738dab6c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:49:03 +00:00
Justin Weir
4682c6576c Merge changes from topic "b221419865" into tm-dev
* changes:
  Change Logcat to only log in background thread in debug mode
  Move logging to background thread in LogBuffer
2022-04-14 11:34:59 +00:00
Justin Weir
123c1b0954 Merge changes from topic "b224749799" into tm-dev
* changes:
  Allow null prev/next buttons to be INVISIBLE instead of GONE
  Remove logging and nullable return type from getCustomAction
2022-04-14 11:34:00 +00:00
Pavel Grafov
6a0d7e9ae7 Merge "Remove fossilized upgrade code." into tm-dev am: c291627ea9 am: 832eb44ff6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591526

Change-Id: I40ad5b1a9ace7ae8ce71a0949b12298689586de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:33:28 +00:00
Mark Renouf
ca4c1601a6 Merge "Explicitly allow access to share targets by package" into tm-dev am: 09f39ec2fd am: 8f7e5f7261
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17669233

Change-Id: Ia6728129f6568ed8e20f4b1d8f8203b3061e9a2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:33:01 +00:00
Pavel Grafov
cb5deeeead Merge "Remove fossilized upgrade code." into tm-dev am: c291627ea9 am: 4bb26ef6b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591526

Change-Id: Ib30389f994e2ee273565951414af8b84e0c9ec6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:32:10 +00:00
TreeHugger Robot
f889c17a66 Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev am: ca1f7d88d4 am: 5b4fd885f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730691

Change-Id: I362e15abea88c417b5c96cb934c280608159859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:32:03 +00:00
Mark Renouf
c5e6057a7b Merge "Explicitly allow access to share targets by package" into tm-dev am: 09f39ec2fd am: e96155bd5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17669233

Change-Id: I24c58dd416f0729d9c8471d89adf8e045095e9c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:32:02 +00:00
TreeHugger Robot
34b6fb54ca Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev am: ca1f7d88d4 am: 60c6c2be2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730691

Change-Id: I553157344187b8519fb444584a55af259583987c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:31:42 +00:00
Chris Li
e677a30105 Merge "Notify organizer when the last activity in TaskFragment enter PiP" into tm-dev am: 88671a050f am: 3b0fca9fe9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17713423

Change-Id: I159d032655bdd94dae8e1d3e4820954d8359a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:29:28 +00:00
Pavel Grafov
4bb26ef6b0 Merge "Remove fossilized upgrade code." into tm-dev am: c291627ea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591526

Change-Id: I4a7139ee51ec8b23199756963923df52c4453a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:29:19 +00:00
Chris Li
251d7fdf2d Merge "Notify organizer when the last activity in TaskFragment enter PiP" into tm-dev am: 88671a050f am: 38f42547e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17713423

Change-Id: I3439bb17ed2f7438133f2bbf01036761a0c7bfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:29:10 +00:00
Pavel Grafov
832eb44ff6 Merge "Remove fossilized upgrade code." into tm-dev am: c291627ea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591526

Change-Id: I8d1e6496d17c510803ddda6e790947cd0d96ea00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 11:28:35 +00:00
Santiago Seifert
12b2d2c768 Fix media_session shell commands
Bug: 227109905
Test: Manually tested using AndroidX Media session demo app.
Change-Id: Ie3cee37689ca2be30c522c1439afd5e6dde374e1
Merged-In: Ie3cee37689ca2be30c522c1439afd5e6dde374e1
(cherry picked from commit 5f18e7a7fc)
2022-04-14 11:04:44 +00:00
Pavel Grafov
c291627ea9 Merge "Remove fossilized upgrade code." into tm-dev 2022-04-14 11:02:12 +00:00
Mark Renouf
8f7e5f7261 Merge "Explicitly allow access to share targets by package" into tm-dev am: 09f39ec2fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17669233

Change-Id: Ib141378b01bc113eea7e6f645c104e3f39ef9656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:49:36 +00:00
Mark Renouf
e96155bd5a Merge "Explicitly allow access to share targets by package" into tm-dev am: 09f39ec2fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17669233

Change-Id: Ib9c11b1618cc09095db067c16b9643b10b129549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:49:22 +00:00
TreeHugger Robot
60c6c2be2d Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev am: ca1f7d88d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730691

Change-Id: I9cb4e169df5ef31151cd94ee0a4351ff1c963641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:49:07 +00:00
Chris Li
38f42547e4 Merge "Notify organizer when the last activity in TaskFragment enter PiP" into tm-dev am: 88671a050f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17713423

Change-Id: If7c315659887740f520ac5f53125a21971bda37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:48:38 +00:00
TreeHugger Robot
5b4fd885f4 Merge "QSFragment: fix NPE in setOverScrollAmount" into tm-dev am: ca1f7d88d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730691

Change-Id: I3211e9a702ebbc9a4df75c9b65d9b065e1026168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:48:24 +00:00
Chris Li
3b0fca9fe9 Merge "Notify organizer when the last activity in TaskFragment enter PiP" into tm-dev am: 88671a050f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17713423

Change-Id: Ia63ce4abd675894b0dca95b96dbf3258fc6de74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:47:43 +00:00
Tony Huang
91d64cea59 Merge "Add error handling for start task and intent" into tm-dev am: 96770f2561 am: 0b5ab0b907 am: 475105c9a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17397155

Change-Id: I7fff14ea5e61597816a6bb233eb1f01dbf8db2e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:36:20 +00:00
Neil Fuller
388fa670e2 Merge "Fix metrics test flakiness" into tm-dev am: d718e76f47 am: d5318be209 am: 5610bcd01a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17713903

Change-Id: Ib27add7e12b160ff0ee6184fe6285c67dab66d6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:35:43 +00:00