Anton Hansson
|
e18de8858f
|
Merge "Refactor merged annotations creation" am: 24f473395d am: 6ca396706d am: d4b424edeb am: 4a658e1f97
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132125
Change-Id: I9efce0ea62bdfa1990fe8e4cb6d5ede2beddc256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 20:00:45 +00:00 |
|
Almaz Mingaleev
|
9c308a61dc
|
Merge "Remove TZUvA feature." am: 10c7acc51d am: 050cc50319 am: cc4630cdbf am: cc5500c99f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/953617
Change-Id: I5143e1dac794717c966f32b7ea93ec2d9c4b7bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:59:44 +00:00 |
|
Automerger Merge Worker
|
7b2232eb64
|
Merge "Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b16 am: 2420b44719" into tm-d1-dev-plus-aosp am: 618e06a9ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19051608
Change-Id: I708fae18fd3c17fb5634a6a15127a118d9e13401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:56:54 +00:00 |
|
TreeHugger Robot
|
d8df34dd21
|
Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b16 am: 38ff7fa099 am: 11c53df842
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19051608
Change-Id: Id38f5b3ef3a1c7937981c4fa661be12b5367fc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:56:32 +00:00 |
|
TreeHugger Robot
|
7cc7f1e202
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours am: da2d8fe459 -s ours am: 6bec2da47b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041684
Change-Id: I35b4c1aed1aed354e80ab6672a91fc0f1f79b133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:56 +00:00 |
|
Bill Yi
|
f989ff3ea2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours am: 4445ed60d8 -s ours am: 3de17216c5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041684
Change-Id: Ia6372d080f23493703b44d25130cfa9ab20f8236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:52 +00:00 |
|
TreeHugger Robot
|
5d0666fe2a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours am: 515e8dd9dd -s ours am: acf376e0a5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041683
Change-Id: Ibe99d744dfd929c5a6d8e05a4fd182e526da0f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:35 +00:00 |
|
Bill Yi
|
a4a81b09cd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours am: bbdb8073e6 -s ours am: 116a56b1e8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041683
Change-Id: I70cb611099fa018ece2c29dd2e48adf488a5720a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:30 +00:00 |
|
TreeHugger Robot
|
9420e40eb7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours am: 60e60ee81b -s ours am: adeb1a46b7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041681
Change-Id: I3378905c05f9df5256d64704b0aff82cd196c38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:23 +00:00 |
|
Bill Yi
|
c9a1fb0b3c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours am: 58c62a1e49 -s ours am: dbafb2cd50 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041681
Change-Id: I47c456a936cebe01809e3ef0e515397cc160957b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:19 +00:00 |
|
TreeHugger Robot
|
f8d5e3ed76
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 932644a8f6 -s ours am: 3d5e29ec32 -s ours am: e69b173a4d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034668
Change-Id: I875db015335aaccac037cf4caa2f8f9d6128d8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:53:02 +00:00 |
|
Bill Yi
|
8d69988140
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd3ad0a763 -s ours am: 76bfeb9882 -s ours am: d436d0f364 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034668
Change-Id: I86865642a9bd788c7f6c76f302e1470914d73072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:52:47 +00:00 |
|
TreeHugger Robot
|
47090281e7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 81222d2803 -s ours am: 382c24812c -s ours am: 93e1d1aad1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041684
Change-Id: I0b2b12f72a4bae46b0175fcf22b832c52c2a1861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:51:32 +00:00 |
|
Bill Yi
|
14147aca2d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84666a2a3a -s ours am: 89df89bd2e -s ours am: d6593bb2e4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041684
Change-Id: I0bfaf366e326b564d45dfd0f5bacda885e52c4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:51:28 +00:00 |
|
TreeHugger Robot
|
408ee985d4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e07f5e2953 -s ours am: c5c67cc1f7 -s ours am: 17cbb3178f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041683
Change-Id: I46ae0468c27a98d47962cd3833bea49db7253ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:51:23 +00:00 |
|
Bill Yi
|
bbb0e50c81
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0064bc1a7e -s ours am: 2067b4c679 -s ours am: 58784bdf8e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041683
Change-Id: I8cf0c8a0d59685f7e6eba8541ada5031a9450806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:51:19 +00:00 |
|
TreeHugger Robot
|
0ad72d8d43
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8c6904ecc0 -s ours am: 8b4c37d56e -s ours am: b3ccc334cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041681
Change-Id: I32e90abd60df6776261730b555d44e296c9809a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:51:14 +00:00 |
|
Bill Yi
|
cb00350056
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44b2921b5a -s ours am: 0eec4ba0dd -s ours am: dbd77b6172 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19041681
Change-Id: I0d75ffd0aac47caf036ecdcd9e38b8a33f1485dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:51:10 +00:00 |
|
TreeHugger Robot
|
26abb15fab
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 932644a8f6 -s ours am: 76fb1dd3af -s ours am: 573d7ed6ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034668
Change-Id: Ib5611e734aaab888ae18a155a023bdd2fdfb93c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:50:47 +00:00 |
|
Bill Yi
|
456e6d0c6b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd3ad0a763 -s ours am: dbba170d2d -s ours am: 2442a9692a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034668
Change-Id: I73d8bbe558daefc781101098debfd1ccf429bf15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:50:17 +00:00 |
|
Automerger Merge Worker
|
40921dbe03
|
Merge "Merge "[Output Switcher] add check on animation" into tm-dev am: 81a014f029 am: 8c97b17d76" into tm-d1-dev-plus-aosp am: 41a555aacc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992666
Change-Id: Ibdd2433960bccf84cb3abf29e083f6a3e3210617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:49:03 +00:00 |
|
Shaowei Shen
|
c8fb919a47
|
Merge "[Output Switcher] add check on animation" into tm-dev am: 81a014f029 am: bf58e8d858 am: 90da4e07d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18992666
Change-Id: Ie6fc8ba28fab62a56c30b3ca314003c6e5b031c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:48:15 +00:00 |
|
Julia Reynolds
|
2ef7c9c523
|
Merge "Expand OWNERS file" into tm-qpr-dev am: 6dfbb419d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19085908
Change-Id: I3bee19d32959c342a9c9778e5cefc5e67a401cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 19:47:31 +00:00 |
|
Julia Reynolds
|
6dfbb419d7
|
Merge "Expand OWNERS file" into tm-qpr-dev
|
2022-06-27 19:04:14 +00:00 |
|
Alex Johnston
|
1d8e5ae0cd
|
Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: 6b10a7a317 am: 85da0a7d66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752
Change-Id: I93eb592c6e6b62e2d89d2db5646075cdfe98ba6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 18:51:47 +00:00 |
|
Alex Johnston
|
85da0a7d66
|
Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: 6b10a7a317
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752
Change-Id: I0ae2c961670bff7b3654d7510d3254d5c3303a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 18:27:43 +00:00 |
|
Alex Johnston
|
6b10a7a317
|
Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752
Change-Id: I074ff67be5aee5088c5913cd050a1e9ed479c5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 18:11:10 +00:00 |
|
TreeHugger Robot
|
0e38feadbc
|
Merge "Update pauseAuth value onPanelExpansionChange" into tm-qpr-dev am: c2b87df84e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065232
Change-Id: Ic76b6322163aa868c036b703fa126eee1a041041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 18:00:40 +00:00 |
|
Alex Johnston
|
2d31bbe7ec
|
Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev
|
2022-06-27 17:52:38 +00:00 |
|
TreeHugger Robot
|
c2b87df84e
|
Merge "Update pauseAuth value onPanelExpansionChange" into tm-qpr-dev
|
2022-06-27 17:42:44 +00:00 |
|
Alejandro Nijamkin
|
7153dc9e03
|
Merge "Removes left/right buttons from bottom area." into tm-qpr-dev am: 2d6505a6a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19053512
Change-Id: I39f4c5205f0facb141099a04cbd2033b91740df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 17:02:39 +00:00 |
|
Alejandro Nijamkin
|
2d6505a6a9
|
Merge "Removes left/right buttons from bottom area." into tm-qpr-dev
|
2022-06-27 16:47:34 +00:00 |
|
Sergey Serokurov
|
3b2ca6dbf9
|
Merge "Check if apps allowed to show bubbles" into tm-qpr-dev am: 0d61ab9e5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19060562
Change-Id: Ia4cd1c155d2f96433b237d5ce8a0ff3f64c65de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 15:47:47 +00:00 |
|
Sergey Serokurov
|
0d61ab9e5d
|
Merge "Check if apps allowed to show bubbles" into tm-qpr-dev
|
2022-06-27 15:30:32 +00:00 |
|
Evan Rosky
|
8c823801c2
|
Merge "Post view-drawing so that it happens after applying start transaction" into tm-qpr-dev am: 633202b4e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19066503
Change-Id: I83e90572e11b6cc13ba8cec33571ab0f6dc161dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 15:14:40 +00:00 |
|
Evan Rosky
|
633202b4e1
|
Merge "Post view-drawing so that it happens after applying start transaction" into tm-qpr-dev
|
2022-06-27 14:58:14 +00:00 |
|
Jeff DeCew
|
dd1abce2f8
|
Merge "Detect when group children are mis-ordered to ensure stability invalidation." into tm-qpr-dev am: 71b42b56aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18353050
Change-Id: If898c99998721d2cbf1942737519c9a9ed99cae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 14:42:36 +00:00 |
|
Julia Reynolds
|
bda0d235d5
|
Expand OWNERS file
Test: TH
Bug: 236149805
Change-Id: I4e9f92f97db1e78615dddfe9128c6d137be95c16
|
2022-06-27 10:38:20 -04:00 |
|
Jeff DeCew
|
71b42b56aa
|
Merge "Detect when group children are mis-ordered to ensure stability invalidation." into tm-qpr-dev
|
2022-06-27 14:23:07 +00:00 |
|
Galia Peycheva
|
f9baaab722
|
Merge "Remove SplashScreen animations on TV" into tm-dev am: 07943a5b9b am: d7f43c22b9 am: 34188c83d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601924
Change-Id: I477f40b9cc68de1f9a1b300a9a14d39fea1fb6a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 13:05:44 +00:00 |
|
Galia Peycheva
|
34188c83d2
|
Merge "Remove SplashScreen animations on TV" into tm-dev am: 07943a5b9b am: d7f43c22b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601924
Change-Id: I1436e2e268efb7f0f17b5d9fd50ee57f6e63c606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 12:50:26 +00:00 |
|
Galia Peycheva
|
d7f43c22b9
|
Merge "Remove SplashScreen animations on TV" into tm-dev am: 07943a5b9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18601924
Change-Id: I5aeffda29e08f4dfa88ea7a27b5cb0a7b2755efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 12:34:20 +00:00 |
|
Galia Peycheva
|
07943a5b9b
|
Merge "Remove SplashScreen animations on TV" into tm-dev
|
2022-06-27 12:19:51 +00:00 |
|
Riddle Hsu
|
5f0bf1da31
|
Merge "Do not use seamless rotation for multi-window" into tm-qpr-dev am: 61ba8c9da7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19043628
Change-Id: Ie6f92c029cf97b22d0326dbe693217229ad33b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 12:02:40 +00:00 |
|
Riddle Hsu
|
61ba8c9da7
|
Merge "Do not use seamless rotation for multi-window" into tm-qpr-dev
|
2022-06-27 11:47:29 +00:00 |
|
Jeff DeCew
|
cfbdcf9124
|
Merge "When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection." into tm-qpr-dev am: c6701d965b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18366674
Change-Id: I82c701a3b9edce5324a6276a67f8d61e903e3f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 11:24:02 +00:00 |
|
Jeff DeCew
|
4ba808972a
|
Detect when group children are mis-ordered to ensure stability invalidation.
Fixes: 204817567
Bug: 237216329
Test: atest ShadeListBuilderTest
Change-Id: I3c9fcd91dd268e03b176235b1c4c79517f9aaa89
(cherry picked from commit 91c4b8dd60)
|
2022-06-27 11:19:04 +00:00 |
|
Jeff DeCew
|
c6701d965b
|
Merge "When applying a RankingMap that lacks an entry, remove that entry from the NotifCollection." into tm-qpr-dev
|
2022-06-27 11:09:09 +00:00 |
|
Jernej Virag
|
083e6141a4
|
Merge "Describe image loads in Traces" into tm-qpr-dev am: bb5c810092
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18805637
Change-Id: Ief820d27145fa1092554820d8216d532f2486a23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-27 09:46:13 +00:00 |
|
Jernej Virag
|
bb5c810092
|
Merge "Describe image loads in Traces" into tm-qpr-dev
|
2022-06-27 09:29:16 +00:00 |
|