Commit Graph

561225 Commits

Author SHA1 Message Date
Riddle Hsu
8fc560cd54 Merge "Check isOnScreen for wallpaper target of recents animation" into rvc-qpr-dev am: b4c3da0819
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13167659

Change-Id: Ib96bb7318f531bb89466c455c000385d0d9066e6
2020-12-07 16:44:49 +00:00
Riddle Hsu
b4c3da0819 Merge "Check isOnScreen for wallpaper target of recents animation" into rvc-qpr-dev 2020-12-07 16:29:08 +00:00
Treehugger Robot
848458fae1 Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da am: c661b70d60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503133

Change-Id: I9cab7d61cfe9fcf6e551b6c225bd36fd222b1753
2020-12-07 08:22:22 +00:00
Treehugger Robot
c661b70d60 Merge "Throw BadParcelableException from set/getParcelable" am: 294dd8f1da
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503133

Change-Id: If26fbc900b82beeab1f68d6e68c7eb1903ee9db9
2020-12-07 08:13:58 +00:00
TreeHugger Robot
300a7b9d8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ed6863d814 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ed1325dfd78276051b75c48197fc2ab818098fc
2020-12-07 08:13:27 +00:00
TreeHugger Robot
792df3a32f Merge "Fix pixel buds icon is empty in output switcher" into rvc-qpr-dev am: 31534b741c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13162479

Change-Id: Iac1a78ec85d20bf244053e556ebdb276dd6bda59
2020-12-07 08:13:01 +00:00
TreeHugger Robot
31534b741c Merge "Fix pixel buds icon is empty in output switcher" into rvc-qpr-dev 2020-12-07 07:53:18 +00:00
TreeHugger Robot
ed6863d814 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-07 07:45:51 +00:00
Treehugger Robot
294dd8f1da Merge "Throw BadParcelableException from set/getParcelable" 2020-12-07 07:32:29 +00:00
Lorenzo Colitti
c6db9acce6 Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: a7e74b30f1 am: f7df588c8f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Id6951382cd12dff2e4f1bd2fe47d063c8998fc2f
2020-12-07 05:18:13 +00:00
James Lin
83196b18cf Merge "[RCS UCE] Remove the unused class RcsPresenceExchangeImplBase and RcsSipOptionsImplBase" am: cb50d9f719 am: efbc1debbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517977

Change-Id: Ib2bdc1252acf17aa28854dfc20701f31152a53f1
2020-12-07 05:17:43 +00:00
Lorenzo Colitti
f7df588c8f Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." am: a7e74b30f1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1502382

Change-Id: Ib92977574ffb28cd2e455328260f215352f24b32
2020-12-07 04:43:19 +00:00
James Lin
efbc1debbe Merge "[RCS UCE] Remove the unused class RcsPresenceExchangeImplBase and RcsSipOptionsImplBase" am: cb50d9f719
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517977

Change-Id: I3f595296536bee56f542bb3c533a32e376f3ae16
2020-12-07 04:39:18 +00:00
Lorenzo Colitti
a7e74b30f1 Merge "Add a test for TcpKeepalivePacketDataParcelable.toString()." 2020-12-07 04:38:53 +00:00
James Lin
cb50d9f719 Merge "[RCS UCE] Remove the unused class RcsPresenceExchangeImplBase and RcsSipOptionsImplBase" 2020-12-07 04:02:17 +00:00
TreeHugger Robot
54ba3513e2 Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged" into stage-aosp-master am: ae356a638d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13176358

Change-Id: I543c375f269988903ccc9d862a828059f5a60393
2020-12-07 04:01:27 +00:00
Xin Li
0cea9ab8e7 DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 66e3e10c63
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13176358

Change-Id: Ie36739b4aa5d9f72a22d303def6cd8604baefcf7
2020-12-07 04:01:19 +00:00
TreeHugger Robot
ae356a638d Merge "DO NOT MERGE - Mark RQ1A.201004.001 as merged" into stage-aosp-master 2020-12-07 03:40:43 +00:00
Bill Yi
4029c271bc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8c34d4e1656d948c367a5bedfce52e10026c9729
2020-12-06 18:05:59 -08:00
Xin Li
66e3e10c63 DO NOT MERGE - Mark RQ1A.201004.001 as merged
Bug: 172690556
Change-Id: I6081bbcb61824d954a2119932804d4549ab7973a
2020-12-06 14:43:21 -08:00
TreeHugger Robot
cb702b1f63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 71550d5204 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56434d3478b0365df99708dc8a92acb2e214bd4f
2020-12-06 20:05:46 +00:00
TreeHugger Robot
71550d5204 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 19:40:19 +00:00
Treehugger Robot
db8b134510 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours am: 5f470bae4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I921594e944c4ba039c160dca37466ee7b32775d4
2020-12-06 16:56:17 +00:00
Treehugger Robot
5f470bae4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4f9abbfb58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a343979692f971fab2373fbe5617566b0ccedd8
2020-12-06 16:39:03 +00:00
Treehugger Robot
f1bde7bba3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21cdf6fe8d -s ours am: c092104a5d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4593c6a74d7075a1a263d84bc84d3750f0cb568a
2020-12-06 16:38:22 +00:00
Treehugger Robot
4f9abbfb58 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:29:22 +00:00
Treehugger Robot
e78ff11f75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e1c70339e -s ours am: ace37a2868 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e9077d396090c06bfe845ea10024f103d76fa51
2020-12-06 16:21:52 +00:00
Treehugger Robot
22bca9c10b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours am: 336114b4b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1c06bdcfd2bb730b61315932f48501bb52bbcd0
2020-12-06 16:21:42 +00:00
Treehugger Robot
c092104a5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21cdf6fe8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8db57950d1f5b21380861fdcad717db985bdb89f
2020-12-06 16:21:19 +00:00
Treehugger Robot
ace37a2868 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e1c70339e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If84abf69c9d7284d6e95441d9d0bd6d7a3cb5b5d
2020-12-06 16:17:43 +00:00
Automerger Merge Worker
5bb0f603f9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master am: da7ac9e54c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a675537840566aea1bfe04d804219627521ee9b
2020-12-06 16:16:02 +00:00
TreeHugger Robot
8caaa711c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1f8d60bdc2eac29accbc1e93610a7ebb3c8bb254
2020-12-06 16:15:47 +00:00
Treehugger Robot
c0ab918d54 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours am: 0bf77bd9c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebb52096885b1ac32487e1cffe3a316f8da84c87
2020-12-06 16:15:32 +00:00
Treehugger Robot
38957d5fba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours am: 728faae9c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89a8bf2848bab75410474218fb5bbd34f9b1d03f
2020-12-06 16:15:18 +00:00
Treehugger Robot
01a0745efd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours am: 7b6d6070bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ad37cea367eb14bb672610179fb8bf2a515e9ab
2020-12-06 16:15:02 +00:00
Treehugger Robot
c2605fa581 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours am: c11efe23f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15a8a69e3b0394ec18cafcd1c21666d12aa0a535
2020-12-06 16:14:38 +00:00
Treehugger Robot
b6bec330c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours am: 8fd78a83ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa94c23d83065a82df2efbd69078af3fc1a2b599
2020-12-06 16:14:09 +00:00
Treehugger Robot
336114b4b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e548ed02cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibcafcd45189026a4f8ba513565c8cab5f247ac28
2020-12-06 16:12:15 +00:00
Automerger Merge Worker
da7ac9e54c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours" into stage-aosp-master 2020-12-06 16:12:04 +00:00
TreeHugger Robot
c110ac2338 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 16:11:02 +00:00
Treehugger Robot
38b62a1d36 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 210dc47d2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae372e5484ccdff96f5167f8e5bf3bf4d90cabea
2020-12-06 16:07:41 +00:00
Treehugger Robot
0bf77bd9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaad525a1d20c429e63e82b0523496357ab79667c
2020-12-06 16:05:41 +00:00
Treehugger Robot
728faae9c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4251442532e811105feb509abd8081c9a23ce8a
2020-12-06 16:04:13 +00:00
Treehugger Robot
21cdf6fe8d Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:02:02 +00:00
Treehugger Robot
7b6d6070bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: dbd5232609 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I163e5a116492998f6b86e5d327e4c9c462db947d
2020-12-06 16:01:29 +00:00
Treehugger Robot
c11efe23f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13eeaecc9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic382f59842d6f557ebf879a05eff1a38a22ec3e3
2020-12-06 16:00:17 +00:00
Treehugger Robot
6e1c70339e Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:58:12 +00:00
Treehugger Robot
8fd78a83ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I126bd1dd97de6b73aab423882ae8e96eded174ea
2020-12-06 15:57:41 +00:00
Treehugger Robot
e548ed02cf Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:57:33 +00:00
Treehugger Robot
210dc47d2b Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:51:02 +00:00