Robert Horvath
|
a1259789ce
|
Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f am: 4d3c2b3b3e am: c87a9d244f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925
Change-Id: Ie26692e809df2f8f8570b96603de5af60f9cab40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:31:15 +00:00 |
|
Edgar Wang
|
8434c2ae35
|
Merge "Add paddinng below "Learn more" link of FooterPrefence" into tm-dev am: 3c2330d3a9 am: d6c0b0e300 am: 6c6e752871 am: c67ef4faf1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18047580
Change-Id: Id726e42b54279d64f715f331bf3ed2956a615f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:30:07 +00:00 |
|
Edgar Wang
|
131f26b9ea
|
Merge "Add paddinng below "Learn more" link of FooterPrefence" into tm-dev am: 3c2330d3a9 am: 5b8ae2c46f am: 922a4c8596 am: 2e20b30d8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18047580
Change-Id: I343d1483208ba5c15d0a2464741b626634f82075
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:28:41 +00:00 |
|
Edgar Wang
|
cddd650e67
|
Merge "Add paddinng below "Learn more" link of FooterPrefence" into tm-dev am: 3c2330d3a9 am: 5b8ae2c46f am: 4c81f0577b am: 556b79b72a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18047580
Change-Id: I00cc0e6c6562ef78286174d975d27639c2a599ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:27:02 +00:00 |
|
Jiakai Zhang
|
8941de0bdc
|
Merge "Check and speed compile System UI on boot." into tm-dev am: 59eb754359 am: 2211f9a2ee am: ece57819cd am: ddee113b4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907956
Change-Id: Ibfceda19163b7d5efc1b914a868f57ead2b13d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:25:53 +00:00 |
|
Vania Desmonda
|
56449949cd
|
Merge "Avoid calling updateSurface twice when dimming is applied." into tm-dev am: bc99f623d4 am: fa9f19cff0 am: d3d50d5378 am: a43e9a5fca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982482
Change-Id: I4e6ae0d6f515af85452d526c279c773cc52b9ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:24:16 +00:00 |
|
Michał Brzeziński
|
125923ba7f
|
Merge "Fixing notifications side margins in large screen portrait" into tm-dev am: f7737d0db9 am: 5bc7a1535d am: 0d527d8a05 am: c8e6cfe2d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18142262
Change-Id: I434632b92be3a24f6e036407459db93294305398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:22:21 +00:00 |
|
Robert Horvath
|
de38296213
|
Merge "Fix re-registering PositionUpdateListener" into tm-dev am: 92d87441e8 am: 3bed2ee0bc am: bb281dc5fc am: 702215f9e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17957083
Change-Id: Iebfdbf1eb618f042031aaa15f6f728987587a37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:20:23 +00:00 |
|
Joonhun Shin
|
eae4cc00ab
|
Merge "Update Api docs for ProvisioningManager#get[Rcs]ProvisioningStatusForCapability and is[Rcs]ProvisioningRequiredForCapability." into tm-dev am: f1c5479dab am: 1c0dcc15c2 am: a30fa5b458 am: a5c00f5c67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130744
Change-Id: Ib3063e24672c62f9ff873e760f69909fd8f0e128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:19:15 +00:00 |
|
Louis Chang
|
de3f500347
|
Merge "Sending RESULT_CANCELED to caller if the activity cannot be started" into tm-dev am: 6b11b0f83b am: 9d85608c4d am: 50a11c25ae am: f9ac35c852
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18131149
Change-Id: Ifef97a1df4f52a48837e25bb96e0a6d679caea0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:18:33 +00:00 |
|
Chris Li
|
bd6e67325e
|
Merge "Don't include PiP activity in app transit" into tm-dev am: 20fc9f1896 am: 0b5131609f am: b5054e3547 am: bc0572cb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938079
Change-Id: I94fa989ae27de1b83566d19fe29425cb6fe1ac2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:17:22 +00:00 |
|
Arthur Hung
|
d612f3a13f
|
Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639cf am: 7015800dfd am: 82b85eaa66 am: f01bb65bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030448
Change-Id: I8622c9fac2ded5c77e10a21eeda1f44b9cc92595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:16:24 +00:00 |
|
TreeHugger Robot
|
f34628d25e
|
Merge "Fix keyboard is attached to wrong task in split" into tm-dev am: 969d1b8eed am: 5d84697681 am: d2fd86f646 am: 0332071689
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17821943
Change-Id: I96eec852ee386fcc9cafa38e2c3a4ca3258133eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:15:38 +00:00 |
|
Joanne Chung
|
00b98008a3
|
Merge "Fix Assistant breaks after stopping the app." into tm-dev am: 4c41912939 am: 7031a7817e am: 4dc13e47d8 am: 85f481bb2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17651837
Change-Id: I2f35359985c7c60b7376122a5ca7dc7434d85789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:14:43 +00:00 |
|
Ryan Lin
|
c584761a16
|
Merge "Fix invalid active window if accessibility framework doesn't track windows" into tm-dev am: a7f5aa5be7 am: 5901d395d6 am: b63ba12e92 am: 240f626fb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17755779
Change-Id: I27995572a621d1eb6385ac98f66251880c2bbca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:13:56 +00:00 |
|
Ryan Lin
|
669f7c569a
|
Merge "Postpone window_state_changed events until the window is added" into tm-dev am: 857459ff56 am: 4db5adedbd am: 7b5e81f298 am: 6fefffe4c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17741153
Change-Id: Icedf6ee037bca3e851b347b957cfdcbd9f452c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:13:03 +00:00 |
|
TreeHugger Robot
|
1261fe3e8e
|
Merge "Add tablet-specific version of string" into tm-dev am: 05f0f0926b am: 1930c6b71c am: 4f07b7672d am: 0ebce61bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152968
Change-Id: Iffa48e062354b564369febe02cddacd99a760518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:06:20 +00:00 |
|
Chaohui Wang
|
fbbd753c01
|
Merge "Add SETTINGS_SLIDER CUJ to InteractionJankMonitor" into tm-dev am: 6474aed2f5 am: 55336bcbd4 am: b7a654945a am: fe31b6acd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17938067
Change-Id: I92c43bba9e190cbda23434d56b429f585bcb3335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:03:30 +00:00 |
|
Xiaowen Lei
|
69cdd19b4a
|
Merge "Add test that ensures setIsDreaming(true) is called by the Smartspace on Dream." into tm-qpr-dev am: 9aa858edca am: 0ab1858441
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18151731
Change-Id: I3284cdc140753d0326f6a94d1220596246d2eff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:02:36 +00:00 |
|
TreeHugger Robot
|
cbe7be86d2
|
Merge "Revert "Revert "[SettingsProvider] enforce permission on openFile""" into tm-dev am: d42fff5d21 am: 00871b04b4 am: e7d7bb51bb am: 1851818548
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18090063
Change-Id: Iaad9d8d51dc8bbc42360026b6e576e32fea8a192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 14:01:40 +00:00 |
|
TreeHugger Robot
|
3c5d4b5ed6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1f732c35cb -s ours am: 1b0fee1631 -s ours am: 9672f74364 -s ours am: b9b543fb3f -s ours am: e67d667bae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18105582
Change-Id: Ie21be15f2770afc58220038f14985592865010c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:59:58 +00:00 |
|
Bill Yi
|
f182762ef2
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e10bb52776 -s ours am: f898ac98e9 -s ours am: 8755f932f3 -s ours am: 5e65f8ab1d -s ours am: 6bebce61ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18105582
Change-Id: Ifbcbb94acd1d2c5374087ab73acb3cb4cb5ee5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:59:44 +00:00 |
|
TreeHugger Robot
|
740bff2269
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f84e8a82cc -s ours am: 1f464c8ebc -s ours am: d92931a2be -s ours am: 7952b1b883 -s ours am: d8cc72b83f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104959
Change-Id: Iceb478ae1baf7831b779a3c9f74544b923427484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:59:10 +00:00 |
|
Bill Yi
|
5ee8670819
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c6a6ef034 -s ours am: aac24f6875 -s ours am: 1257db159b -s ours am: 2f5602fd01 -s ours am: df0b4fb5db -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104959
Change-Id: I0470f9b07bd5e902be381e4fcdda34ac55be1b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:58:39 +00:00 |
|
TreeHugger Robot
|
18c1712a83
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8d645abaa4 -s ours am: cc86b1e8f3 -s ours am: b3c77f0926 -s ours am: 817909b07d -s ours am: 4ade29f6aa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110544
Change-Id: I3d2a9284015d2ecd03a94ae7adf669718256316c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:56:56 +00:00 |
|
Bill Yi
|
81dad4827c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0efee7721 -s ours am: 66e1613bdc -s ours am: 9a68cc005f -s ours am: 3a2646ca54 -s ours am: 4b1ad7290b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110544
Change-Id: I88cebc98addc192a3feda0375159f5066e40e6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:56:36 +00:00 |
|
TreeHugger Robot
|
f201c9c191
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0b0df3a55c -s ours am: acc5036fdd -s ours am: 181f6f597d -s ours am: c2f52de56f -s ours am: e492726a95 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110542
Change-Id: Ic72e942c6199ce1a82428c67c2a23e5274ce0ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:56:18 +00:00 |
|
Bill Yi
|
ae6b53f0e6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c1ca24bf -s ours am: 5fc375336c -s ours am: ea2bf0cc29 -s ours am: 9441778ac4 -s ours am: ba25223aa7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110542
Change-Id: I444f1e034f104cdb9a985564cff0b254d7cc8715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:55:57 +00:00 |
|
TreeHugger Robot
|
be3052c4a4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fee7e4b454 -s ours am: 13340b45d6 -s ours am: 55635003ac -s ours am: c3aaacf7a3 -s ours am: 00a6d0936e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110470
Change-Id: I2c3551f6724c4bd70b2990742444f7bf5486ce70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:55:42 +00:00 |
|
Bill Yi
|
4b56edce13
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af4ba70aaa -s ours am: 4f71164e72 -s ours am: 5c08b38eac -s ours am: 1222a534f3 -s ours am: 35c83bb457 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110470
Change-Id: Ifcf2cde88ecfc559512a241e66ff92c1ef68c914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:55:15 +00:00 |
|
TreeHugger Robot
|
a48a1bf7cf
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a6e4af9040 -s ours am: 071c2b9ac0 -s ours am: 32172eb2e5 -s ours am: a44e2bda90 -s ours am: 513a96b550 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110351
Change-Id: Ie3292816652f0f6e42ad2e8a3a93e0dd3a18b5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:55:01 +00:00 |
|
Bill Yi
|
c22deda22f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b3f6a91e3 -s ours am: 2ef4ce5ceb -s ours am: 178ceb0694 -s ours am: e3ec139a71 -s ours am: 98fb7b0774 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18110351
Change-Id: I5aa06614543607ed01c8044bc3548259f7d45539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:54:32 +00:00 |
|
TreeHugger Robot
|
ad2878068c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1dcb6f1d93 -s ours am: 29b6ac4039 -s ours am: 4dbc6dbba7 -s ours am: 7770b742e3 -s ours am: 71a10d005d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108441
Change-Id: I43eef53d6e8f898771ae51cc227d015c2348f6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:54:04 +00:00 |
|
Bill Yi
|
8c6943ee62
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f3b14e926a -s ours am: 2b96af4216 -s ours am: 762a2f88f3 -s ours am: c90b69381f -s ours am: 1c54223832 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108441
Change-Id: I85eb4d914b20ab2ae8c8f0f76f421c45228c184a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:53:27 +00:00 |
|
Robert Horvath
|
c87a9d244f
|
Merge changes I6a3f56bd,Ib5f39eb1 into tm-dev am: 1999fa1097 am: 7d58f8562f am: 4d3c2b3b3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17888925
Change-Id: Ia7e7faef3dbd9f8ad3891e51a8422b6cfd4fd204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:52:21 +00:00 |
|
Louis Chang
|
b80b80b799
|
Merge "TaskFragmentParentInfo should be updated for LTR/RTL changes" into tm-dev am: 4e073427ed am: 8ffffd65b5 am: f6d331b3b5 am: 0d8d242316
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130747
Change-Id: I9c362cd29821da61315910a2cc898f5916c6c050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:48:45 +00:00 |
|
Louis Chang
|
9a67669371
|
Merge "Execute pause timeout only when attached to a process" into tm-dev am: bdeddd7629 am: a1f39bcc0c am: 64f54a6c74 am: 55fca1e304
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134122
Change-Id: I3422ed9136865d8d40ff26f98f274627d8801774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:48:07 +00:00 |
|
Alex Buynytskyy
|
2ed60a301e
|
Merge "More robust restorecon and additional debug info." into tm-dev am: 8169e839ca am: a18cf5d20f am: aa28895197 am: 6fff5a29ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129666
Change-Id: Iac37ffa92fa1bbb517bfb0613526176e689a7246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:47:32 +00:00 |
|
Lucas Dupin
|
819e4bd69e
|
Merge "Revert "Do not ignore forceReload requests"" into tm-dev am: b681d512ab am: 8f106b97ae am: b43f54f27a am: 62e45ec9bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130402
Change-Id: Ie54175f7d0c6616c30d8d7f8ce2f90154e094b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:46:57 +00:00 |
|
Hawkwood Glazier
|
ad5bf51624
|
Merge "Fix corner clipping on UMO" into tm-dev am: c1170e1cd8 am: a7423d6294 am: 1e944284b9 am: e2ef067a2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944767
Change-Id: Iefb9ee51e93e1fafb53cf31450e1cd7440bba8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:46:06 +00:00 |
|
Hui Yu
|
b3ec9140ef
|
Merge "canStartForegroundServiceLocked() checks both UID and binding client UID." into tm-dev am: d7f6a11db4 am: eb12b1ce32 am: 6551471d19 am: b5ea650674
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18011485
Change-Id: I765bfaf4d5f891f4134827e1ab69b7674a3ccc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:45:15 +00:00 |
|
Dmitri Plotnikov
|
c80d367a05
|
Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90fbd am: 892520724e am: 63f6625add am: 1292aeb55e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18062923
Change-Id: I3a14b466333a57da4bac4281efada7075bfef566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:44:14 +00:00 |
|
Ilya Matyukhin
|
e2dbaedf72
|
Merge "Add onUiReady to AlternativeTouchProvider" into tm-dev am: 6bcd7fdc9a am: 1564ee9dcc am: e885bfa511 am: 755b1864b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18129622
Change-Id: I4aa7036b5b178295fc0dcc0e55489b0cffd52882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:41:59 +00:00 |
|
Hawkwood Glazier
|
553c6cd633
|
Merge "Fix Squashing Issue on UMO Background" into tm-dev am: 7d130a7e1f am: 0ea784a667 am: fe4ded55ad am: c4d34e48e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18122353
Change-Id: Ia9adfcd4b81f438a389a0755021f527f89a8f643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:40:52 +00:00 |
|
TreeHugger Robot
|
c2a83375ad
|
Merge "Add hidden constants to allow the role holder updater to specify the failure strategy" into tm-dev am: a3ca84f805 am: f5f646bf3f am: 43200e0df9 am: 32decca641
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18093642
Change-Id: I8c429a759b39bce99b1331bfc2a790e3c83930c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:40:11 +00:00 |
|
Automerger Merge Worker
|
ffd8189d7b
|
Merge changes from topic "am-29d862ff3c154eb08831104e620095b8"
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours am: 2ffa916b4e -s ours am: 8c855c6e46 -s ours am: 4f0ca15a68 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f8405 -s ours am: e4ceca1e31 -s ours am: 686fda7c64 -s ours am: 7ffc5f214d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d8c -s ours am: 9fc2570531 -s ours am: 4165978c70 -s ours am: 8958207d00 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b084482 -s ours am: 689cc72e26 -s ours am: b48e87a72e -s ours am: ab39238950 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6666ab2b4e -s ours am: 046354c916 -s ours am: 24d3a328d4 -s ours am: 189a7e44e6 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b877f7d946 -s ours am: 510c5dcf82 -s ours am: 2aaa6a4b62 -s ours am: 2df8731e79 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8625d03046 -s ours am: 5528905c70 -s ours am: 881b8abdcf -s ours am: a4f08063df -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 00fe9973d7 -s ours am: 7dcfe1aa66 -s ours am: 258497440a -s ours am: 08218f894c -s ours
|
2022-05-04 13:39:45 +00:00 |
|
TreeHugger Robot
|
1ebd4aa44e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcf2d1da52 -s ours am: 2ffa916b4e -s ours am: 8c855c6e46 -s ours am: 4f0ca15a68 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18096513
Change-Id: I4e580f3b574020e95c9221804fb193cef0a41e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:39:06 +00:00 |
|
Bill Yi
|
1b664a5708
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8dfb5f8405 -s ours am: e4ceca1e31 -s ours am: 686fda7c64 -s ours am: 7ffc5f214d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18096513
Change-Id: I6b51c9593e06c5a17948804084ec92b9c07010c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:38:48 +00:00 |
|
TreeHugger Robot
|
9fdb3354f7
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 66688f0d8c -s ours am: 9fc2570531 -s ours am: 4165978c70 -s ours am: 8958207d00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18096509
Change-Id: I979cdf34f31cb351ea9f67c89d9b65f7ecac3a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:38:11 +00:00 |
|
Bill Yi
|
5f90cdcb50
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5a2b084482 -s ours am: 689cc72e26 -s ours am: b48e87a72e -s ours am: ab39238950 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18096509
Change-Id: I066792aa8966302791505ed9923741791683ef6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-05-04 13:37:43 +00:00 |
|