Anton Hansson
5013902a24
Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d am: ec1f981309
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736
Change-Id: I5d242cf5b18c4b556105cfcfe78df2ac18a8544e
2021-03-31 18:01:32 +00:00
Anton Hansson
0cc07233b7
[automerger skipped] Partial cp of "Move Tuner resource updating from Tuner java into Tuner client" am: 459d9506ee am: 8070534537 am: f15dfd0e7f -s ours
...
am skip reason: skip tag Change-Id I46acdd2f118d5b082aa162c680661a304b4f628b with SHA-1 39a3fa4653 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655735
Change-Id: I73f33ddbb76a2ced89851be1ec2f23376c39a2e1
2021-03-31 18:01:23 +00:00
Anton Hansson
c2481b1868
[automerger skipped] Partial cp of "Initial boilerplate for an updatable graphics jar" am: fbb283fb4d am: 7b9569be9d am: cd6462f0d0 -s ours
...
am skip reason: skip tag Change-Id I148b54fe47560b2335e9d878ed93bf167d6c7517 with SHA-1 ef37c24f44 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655734
Change-Id: I36c573f60ef9f0778b4f5380375c5e1b69f80501
2021-03-31 18:01:08 +00:00
Jacqueline Bronger
b172d762e2
Merge "Fix highlight for RestrictedPreference" into sc-dev
2021-03-31 17:58:49 +00:00
Pinyao Ting
4c52d6b18e
Merge "Fixes an issue in shortcut persistence." into sc-dev
2021-03-31 17:48:17 +00:00
Tiger Huang
8e60e725e1
Merge "Don't throw unsupported exception over binder call" into sc-dev
2021-03-31 17:44:54 +00:00
Anton Hansson
ec1f981309
Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9 am: 4bc578052d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736
Change-Id: Ib8d66e1fb8845f3b47fd6e81091c0286ca6c8c9c
2021-03-31 17:32:14 +00:00
Anton Hansson
f15dfd0e7f
Partial cp of "Move Tuner resource updating from Tuner java into Tuner client" am: 459d9506ee am: 8070534537
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655735
Change-Id: Ic065ac1b5251c01cea8811412be651448e6cb861
2021-03-31 17:32:12 +00:00
Anton Hansson
cd6462f0d0
Partial cp of "Initial boilerplate for an updatable graphics jar" am: fbb283fb4d am: 7b9569be9d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655734
Change-Id: Ieb945343dcea6d1a738fa4e8a4d51790d85721dd
2021-03-31 17:32:09 +00:00
Mady Mellor
84c2799985
[automerger skipped] Merge "DO NOT MERGE Fix bubbles for workprofile" into rvc-qpr-dev am: 215fe70123 am: 2c33af6ebb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14022593
Change-Id: I610658e105a788512c2a4871b2a20d752bbd232b
2021-03-31 17:20:26 +00:00
Mady Mellor
7de8a17f2a
[automerger skipped] DO NOT MERGE Fix bubbles for workprofile am: edddfb37ef am: b1168f57da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14022593
Change-Id: Iacb1b895f6cf4fd846c6cc784ca6fabe763ab52c
2021-03-31 17:20:02 +00:00
TreeHugger Robot
93c7bee5c0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a733f7d5fd -s ours am: 939587c8ff -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14038780
Change-Id: I5494e59efed43277e38f64fac54c488ed10a09ee
2021-03-31 17:19:31 +00:00
TreeHugger Robot
771341499d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 168e02b329 -s ours am: 2c4e6b5cc2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14038781
Change-Id: Iad2957837b6f406b6ef855d8f0fbe9a4e8930b46
2021-03-31 17:18:50 +00:00
TreeHugger Robot
e6ebe3c0e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2d28697996 -s ours am: ff941bce64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14047616
Change-Id: Id89f3ec5966ca7ec5cffc22f4c72971577afd573
2021-03-31 17:18:15 +00:00
TreeHugger Robot
44c215371a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b9c74d5f8c -s ours am: 5c61569c3a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14046105
Change-Id: Icb5df0cd66051144aabf134f67d930b7b1de0202
2021-03-31 17:17:30 +00:00
Automerger Merge Worker
da177c6ce9
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0374c6150f -s ours am: f210a399a4 -s ours" into sc-dev
2021-03-31 17:17:15 +00:00
TreeHugger Robot
4808bcc3dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0374c6150f -s ours am: f210a399a4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14043841
Change-Id: I45c5bbfddb6a3aff7b6c6777b89cafff81e51b3b
2021-03-31 17:16:49 +00:00
Kevin Han
a800579be0
Merge "Add last time unhibernated to dumped info" into sc-dev
2021-03-31 17:16:44 +00:00
TreeHugger Robot
5e56a422ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 76fee3eb7e -s ours am: ea3d27b998 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049080
Change-Id: I750c1f0e41041e16a4513667b2f4e01a71c8f033
2021-03-31 17:13:20 +00:00
TreeHugger Robot
b3f79e4e7e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 16:57:32 +00:00
Nataniel Borges
400197ade7
Merge changes from topic "remove-all-tasks" into sc-dev
...
* changes:
Ensure apps not running on cold launch test
Remove all tasks before flicker tests
2021-03-31 16:54:05 +00:00
Mady Mellor
3da85d8e80
Merge "API: Expose whether bubbles are enabled or not" into sc-dev
2021-03-31 16:53:16 +00:00
Anton Hansson
4bc578052d
Merge changes I97086e30,Ic55df4cf,I81a08c29 am: 4199ef90b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736
Change-Id: I8e76e32f36c8e9f24020cd8b79c2ab2661344236
2021-03-31 16:49:01 +00:00
Anton Hansson
8070534537
Partial cp of "Move Tuner resource updating from Tuner java into Tuner client" am: 459d9506ee
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655735
Change-Id: If4676fda1f43db7ff4fcf349d1cf857428acb4e9
2021-03-31 16:47:40 +00:00
Mady Mellor
2c33af6ebb
Merge "DO NOT MERGE Fix bubbles for workprofile" into rvc-qpr-dev am: 215fe70123
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14022593
Change-Id: I7bb1c45a9713697f9435041942a0b5b19546e406
2021-03-31 16:46:14 +00:00
Mady Mellor
b1168f57da
DO NOT MERGE Fix bubbles for workprofile am: edddfb37ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14022593
Change-Id: Id2ddb04f703859381ef4c47fde82a35b2051558f
2021-03-31 16:46:03 +00:00
TreeHugger Robot
939587c8ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a733f7d5fd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14038780
Change-Id: Ibb2303e5db2366efe8c3b1970a6b1849d0540b93
2021-03-31 16:45:12 +00:00
TreeHugger Robot
2c4e6b5cc2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 168e02b329 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14038781
Change-Id: I69a9453cb1859b209963d9a24edfeb5847dc12ed
2021-03-31 16:44:45 +00:00
Anton Hansson
7b9569be9d
Partial cp of "Initial boilerplate for an updatable graphics jar" am: fbb283fb4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655734
Change-Id: Ib0f232997e4bb7ce2500e37440f23b026fc53feb
2021-03-31 16:44:18 +00:00
TreeHugger Robot
ff941bce64
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2d28697996 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14047616
Change-Id: Ie3b2189f4deb1ad21be35128a60eed857444c414
2021-03-31 16:44:14 +00:00
TreeHugger Robot
65da93d3fd
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 16:43:53 +00:00
TreeHugger Robot
5c61569c3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b9c74d5f8c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14046105
Change-Id: I398d51e859def03345143a62daf48648fb752752
2021-03-31 16:43:44 +00:00
TreeHugger Robot
f210a399a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0374c6150f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14043841
Change-Id: Id684252e2479101d401507b4b958f38152ee28ce
2021-03-31 16:43:19 +00:00
TreeHugger Robot
ea3d27b998
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 76fee3eb7e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14049080
Change-Id: I22a41cb38907b8858008fdfc870d27e77ce03344
2021-03-31 16:42:47 +00:00
TreeHugger Robot
f3e8c6e2c3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 16:32:24 +00:00
Mady Mellor
215fe70123
Merge "DO NOT MERGE Fix bubbles for workprofile" into rvc-qpr-dev
2021-03-31 16:32:11 +00:00
TreeHugger Robot
5453ad8921
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-31 16:31:10 +00:00
Ben Lin
beb4f03369
Merge "PiP: update magnetic field radius for dismissmal as PiP resizes." into sc-dev
2021-03-31 16:29:22 +00:00
Anton Hansson
c48f22cb96
[automerger skipped] Merge "Delete framework-updatable-sources filegroup" am: 9a7ad7fa85 am: bfd4a5c1ae am: 59f00f794e -s ours
...
am skip reason: skip tag Change-Id I42e7044471262bf901b8c130a50e1a8a8170c600 with SHA-1 35c0b09876 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655733
Change-Id: I303b138294579476d19b7df2303ede60eed0f48f
2021-03-31 16:27:42 +00:00
TreeHugger Robot
a733f7d5fd
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-31 16:26:40 +00:00
VITO KAO
f5396c640c
Merge "[Provider Model] Enable Provider Model by default" into sc-dev
2021-03-31 16:25:10 +00:00
TreeHugger Robot
168e02b329
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-31 16:23:28 +00:00
TreeHugger Robot
2d28697996
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-31 16:21:49 +00:00
TreeHugger Robot
b9c74d5f8c
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-31 16:21:09 +00:00
Peter Kalauskas
e5a620c011
Merge "Update QS user switcher style" into sc-dev
2021-03-31 16:20:12 +00:00
TreeHugger Robot
0374c6150f
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-31 16:19:59 +00:00
TreeHugger Robot
76fee3eb7e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-31 16:16:28 +00:00
Anton Hansson
4199ef90b9
Merge changes I97086e30,Ic55df4cf,I81a08c29
...
* changes:
Move framework java filegroups into subdirectories
Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
Partial cp of "Initial boilerplate for an updatable graphics jar"
2021-03-31 16:13:13 +00:00
TreeHugger Robot
4b0b2283ca
Merge "Correct garbled rebase re FGS notification ratelimit" into sc-dev
2021-03-31 16:08:28 +00:00
Winson Chung
87a79200bd
Merge "Fix some issues with pinch to resize" into sc-dev
2021-03-31 16:03:23 +00:00