Commit Graph

766934 Commits

Author SHA1 Message Date
Louis Chang
a304536bfa [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours am: 5a13803145 -s ours am: 84ffde6aee -s ours am: bb77da695a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I211ee1b49dd02587ab2c35ed99f1e7d9b947084c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:56:17 +00:00
Louis Chang
7d469bc6b3 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours am: 13d83ff367 -s ours am: c8ee8aa4b6 -s ours am: e57322da82 -s ours am: 304cb179a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31274f61eba94e1488a4f3e15dc93459d4094f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:56:12 +00:00
Louis Chang
bb77da695a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours am: 5a13803145 -s ours am: 84ffde6aee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7de55f2d7c12c6aec3df37987fec0b85f70f3920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:38:32 +00:00
Louis Chang
304cb179a6 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours am: 13d83ff367 -s ours am: c8ee8aa4b6 -s ours am: e57322da82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98f4a9ea559d29411f909643ef41d9efb9908e8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:38:07 +00:00
Louis Chang
84ffde6aee [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours am: 5a13803145 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I564688b67c22fbbd651d438775c2a2d93ad0fc19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:19:21 +00:00
Louis Chang
e57322da82 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours am: 13d83ff367 -s ours am: c8ee8aa4b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I558effa82d3be5e682d4eeceaf4b9745f87aa656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:19:04 +00:00
Louis Chang
5a13803145 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours am: 62767d9c63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1d2dd03673bac844eb986f5616f4186661101bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:01:38 +00:00
Louis Chang
c8ee8aa4b6 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours am: 13d83ff367 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I96ee0c51f7080bee5f8fd5b6482466116a3351ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 01:01:22 +00:00
Louis Chang
62767d9c63 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev am: 34f726089c -s ours
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 b9a9340645 is already in history

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

Change-Id: I3bd05469fbbc1f9de82b11850c9edf155aabcd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 00:44:48 +00:00
Louis Chang
13d83ff367 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: 834812c423 -s ours
am skip reason: Merged-In I854dd825bfd9a2c08851980d480d1f3a177af6cf with SHA-1 b9a9340645 is already in history

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

Change-Id: I23dabc778ae73387e01f8045e6e5e1276198a069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 00:44:32 +00:00
Louis Chang
34f726089c Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into rvc-dev 2022-08-15 00:21:27 +00:00
Shaowei Shen
90949a94a1 Merge "[Output Switcher] Add platform config for Output Switcher" into tm-dev am: 9e042e9da2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19600072

Change-Id: I2678e07be86e712f4f627cd09e18316c1a5a8f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 17:25:51 +00:00
Shaowei Shen
9e042e9da2 Merge "[Output Switcher] Add platform config for Output Switcher" into tm-dev 2022-08-13 17:02:23 +00:00
Bill Yi
5cf0ec20a7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-13 16:45:38 +00:00
Bill Yi
529729d364 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-13 16:45:38 +00:00
Bill Yi
c614f98734 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-13 16:45:38 +00:00
TreeHugger Robot
6356a97043 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cc9f928062 -s ours am: 4415aeb96b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I786f86c892e907dfe47ead07255803113c997cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:36 +00:00
Bill Yi
906b1cb233 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 259c1605c5 -s ours am: 3cedb8305d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie28252f0040ea40955439c6cf377d245897b1320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:34 +00:00
TreeHugger Robot
6acf2afbdb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bd67b85760 -s ours am: 38f37a79c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17380581efbb371930454e3a931f20f300686f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:29 +00:00
Bill Yi
c2254900b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65f2e4546a -s ours am: 95dce8993b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4199588d7e177c6ac0b8ac8ed78c715895a8eef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:22 +00:00
TreeHugger Robot
8635e3a7a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d11c19eee1 -s ours am: 08676fc5d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib037327c8d25c226875d131f278af5f5d5c83480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:11 +00:00
Bill Yi
19caba09e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ee61bde16 -s ours am: 9b748c30f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25218a4121cfa99ff83627fee99a68d81539fe3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:33:01 +00:00
TreeHugger Robot
4415aeb96b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cc9f928062 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f4f46b44ff2889957a2f919fe9c4b084553ecf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:03:31 +00:00
Bill Yi
3cedb8305d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 259c1605c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I635d852f29bfb5d767e2df1b61bf8894e6849ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:03:11 +00:00
TreeHugger Robot
38f37a79c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: bd67b85760 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c3579f2c9d017d986a723ea6625e498e5def765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:02:35 +00:00
Bill Yi
95dce8993b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65f2e4546a -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9e57ed7f04ff65d7c0676647eeee46e01107e06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:02:22 +00:00
TreeHugger Robot
08676fc5d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d11c19eee1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0d6c6b0b0edb5568c483cb1c31ec6ae7fef444e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:01:53 +00:00
Bill Yi
9b748c30f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ee61bde16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b7983039e83a04480f2f7b8df10258af0916140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-13 04:01:17 +00:00
TreeHugger Robot
f67741bb20 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-08-12 19:50:02 +00:00
TreeHugger Robot
d95592f161 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6d2bd0ab82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd18549deb836508bbb13ef46aaf75db624993d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 19:06:48 +00:00
Bill Yi
49a8e8504e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8562471df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67e6aed28d602e0173de1f9e09255d498e2725a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 19:06:23 +00:00
TreeHugger Robot
cc9f928062 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:00 +00:00
TreeHugger Robot
bd67b85760 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:00 +00:00
TreeHugger Robot
d11c19eee1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-08-12 18:52:00 +00:00
TreeHugger Robot
6d2bd0ab82 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-12 18:50:31 +00:00
shaoweishen
56473a5946 [Output Switcher] Add platform config for Output Switcher
add config indicate Output Switcher's version for supporting different
feature on remote devices operation.

Test: build pass
Bug: 241448326
Change-Id: Ic09daff5ec63d1124a518ff3edc6bb059b150b80
2022-08-12 14:31:53 +00:00
Bill Yi
259c1605c5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If07d7eda8ffbde4a504351071811ede99caa020d
2022-08-12 07:05:45 -07:00
Bill Yi
a6c4fdc146 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0c1a2c90d028b7a3b3e32c9686aec72789a4b665
2022-08-12 00:45:05 -07:00
Bill Yi
edaa097231 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9761a828611d7461787755012fe4dee61e3bb89a
2022-08-11 22:16:43 -07:00
Bill Yi
f3d3a361b6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I721dd5f876719be9c29796f7782a0a41edbfe997
2022-08-11 20:45:41 -07:00
Bill Yi
2ee61bde16 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I76bf3751a77c380d1379fdbd00cb29d751acd24f
2022-08-11 18:25:22 -07:00
Bill Yi
65f2e4546a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I88616d22c0394c85b15501b77e6274f481398eff
2022-08-11 16:01:26 -07:00
Bill Yi
bcbde6ab8a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5bc16ed59820c31a068deda553099c074a1f9db7
2022-08-11 15:46:33 -07:00
Bill Yi
b8562471df Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaee5bafd6505453d7fb6b8656a2271f26475303a
2022-08-11 15:39:01 -07:00
TreeHugger Robot
756426c8aa [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours am: 9fd3c6f739 -s ours am: 8dcf8376e0 -s ours am: ab3967b202 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4e3c25e642ac0833a698581d2fc5b5b3c214b56c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:13:28 +00:00
Louis Chang
ddfe26363b [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours am: ea1b568787 -s ours am: 011c642e50 -s ours am: 6a929ac60f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1801fff25e46a40f945713f3023e908ae8d2db71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:13:26 +00:00
TreeHugger Robot
b98cf72142 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours am: 8ddfb724a4 -s ours am: f936e56dd3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I39d9c7c9e152153c2b1170b69ec0bfec2045b1c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:12:28 +00:00
Louis Chang
77cd149bc5 [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours am: 2f8a15c0a9 -s ours am: 0a8fd8ad98 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idadf563f258afe8a2b227e6dac42ee30b46bb2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:12:21 +00:00
TreeHugger Robot
ab3967b202 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours am: 9fd3c6f739 -s ours am: 8dcf8376e0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c3cdf83e96c6c44443a4a3e7c5533dd22f47c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:11:29 +00:00
Louis Chang
6a929ac60f [automerger skipped] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645 am: 53c6a79cfd -s ours am: b38b3eaccb -s ours am: 7ca38bea98 -s ours am: 2f75f308be -s ours am: ea1b568787 -s ours am: 011c642e50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32403d1a712a51437cbeb5bc23fdec9b0b46b620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 19:10:58 +00:00