Treehugger Robot
8e95c6e66a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-12 18:38:34 +00:00
Bill Yi
817fa66f8b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idfc95fbffa4b55fe31507a00c25ce3d99d058c79
2023-04-10 23:53:44 -07:00
Bill Yi
bc0dc12fce
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I636427362221ee1405fa14fd1d66218793460cff
2023-04-10 23:51:57 -07:00
Jason Chiu
1bd4b6e2ea
[automerger skipped] Refine permission check process of 2-pane deep link am: 0f13f70655
-s ours
...
am skip reason: skipped by user chiujason
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906
Change-Id: I5669aefc0320ecdc610c56e0aade5600b5a1c79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 06:26:10 +00:00
Jason Chiu
0f13f70655
Refine permission check process of 2-pane deep link
...
- Check the deep link activity instance before redirecting to the
internal activity for the managed profile invocation, so the caller
can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
new caller and check if it has a permission to open the target page.
Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 04:23:01 +00:00
Bill Yi
bc051a4860
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-04-04 04:33:23 +00:00
Bill Yi
4c6c727262
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie6806ae2768788dbef4a8dcff5f418970731ebb6
2023-04-02 17:46:34 -07:00
Bill Yi
7a4e68d269
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieb9881a34662fb6c68038a3702b7e26907e25ef0
2023-04-02 17:45:04 -07:00
Julia Reynolds
f445bb3b32
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours am: e4ce644bfe
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie5dfb22c27e0557719ddd96c104f5582f6c14b43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:36:12 +00:00
Julia Reynolds
e4ce644bfe
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours am: 684952a8b0
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I760d7d641cc26d9d640c3504414a16a26d70bc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:57:36 +00:00
Julia Reynolds
684952a8b0
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours am: 85c25d29d7
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:25:15 +00:00
TreeHugger Robot
71f0ec1432
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-30 06:57:35 +00:00
Julia Reynolds
85c25d29d7
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours am: cfacc2acb8
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:58:46 +00:00
Julia Reynolds
cfacc2acb8
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours am: 8befc27425
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425
[automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290648
Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-29 15:56:56 +00:00
Bill Yi
71ac923b9e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9b2e5e99dedd51de896dc2a34814e0ef8b658595
2023-03-28 17:51:47 -07:00
Bill Yi
ac1796011a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I99912ab2402e8f08b599c8ad69252ba0c413f687
2023-03-28 17:50:06 -07:00
Julia Reynolds
592574f05d
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours am: 82fcfa8da0
-s ours am: 40bec70af8
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I34532bbc1689a65d9d5cac6325956e4931ee7a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 22:03:48 +00:00
Julia Reynolds
40bec70af8
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours am: 82fcfa8da0
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours am: 7c9190d25a
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 21:16:39 +00:00
Julia Reynolds
7c9190d25a
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours am: ceb2d0400a
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:43:18 +00:00
Julia Reynolds
ceb2d0400a
[automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290647
Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 20:25:32 +00:00
Julia Reynolds
8a344f301b
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours am: acb5e90d5d
-s ours am: 7594f2deea
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I703bdb03adef5c11693b308a6e2f897417e43b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:45:07 +00:00
Julia Reynolds
7594f2deea
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours am: acb5e90d5d
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I22fe2da8599d3a5b002f6c145a15e71ed06634e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:20:42 +00:00
Julia Reynolds
acb5e90d5d
[automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
am: cbb6811219
-s ours
...
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 19:08:05 +00:00
Julia Reynolds
cbb6811219
[automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
...
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290646
Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:07 +00:00
Julia Reynolds
a39e960067
Don't show NLSes with excessively long component names am: 1f3969f615
am: 2e701b29dc
am: 0f7287271f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645
Change-Id: Ie692fc30c4a91f1e318406a000eda9033ca1bcac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 16:24:35 +00:00
Julia Reynolds
0f7287271f
Don't show NLSes with excessively long component names am: 1f3969f615
am: 2e701b29dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645
Change-Id: I65575bb2f0bf4b82498c523f8d0b4b76628e2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 15:53:58 +00:00
Julia Reynolds
2e701b29dc
Don't show NLSes with excessively long component names am: 1f3969f615
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645
Change-Id: I6316f0181d44d0d0a83f09d36d27cc4839e4ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 15:27:55 +00:00
Julia Reynolds
5c488e5c5b
Don't show NLSes with excessively long component names am: 90ced5d2ec
am: d9604dbe15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644
Change-Id: I95a372829943314799c06b1bd52594067f43327d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 13:47:32 +00:00
Julia Reynolds
55b6779852
Don't show NLSes with excessively long component names am: 793257967f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643
Change-Id: Ia55de46522617d022142a6d1e753569689682a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 13:47:02 +00:00
Julia Reynolds
d9604dbe15
Don't show NLSes with excessively long component names am: 90ced5d2ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644
Change-Id: Iaf70f837d7d41f485d1b6082aa2af535264de3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-28 13:45:14 +00:00
Julia Reynolds
11ac41d9b6
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 16:14:27 +00:00
Julia Reynolds
79cb59e618
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 16:13:15 +00:00
Julia Reynolds
1f3969f615
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:55:41 +00:00
Julia Reynolds
90ced5d2ec
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:54:48 +00:00
Julia Reynolds
793257967f
Don't show NLSes with excessively long component names
...
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:53:52 +00:00
Bill Yi
af01fb89de
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I677ce443d4d68356f6c07e9b2ff3e179f5f9b3e8
2023-03-22 12:22:28 -07:00
TreeHugger Robot
3dc2599568
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-17 23:03:30 +00:00
Bill Yi
59769526e0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15422a02d7174c3cfc21c00ce39cbde8d0234c8b
2023-03-16 20:29:17 -07:00
Bill Yi
7c58d10ebb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9910d114216f4f3c749fa096cb37e0d843bb82fc
2023-03-16 20:23:48 -07:00
Bill Yi
1b76d26f1b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-16 05:20:45 +00:00
TreeHugger Robot
8d91a57792
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-03-16 00:51:39 +00:00
Dmitry Dementyev
6faa24da9d
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
am: 9bec974991
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ieaea748f1a7f75954f16acce47a94aeb20d86fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 22:17:09 +00:00
Dmitry Dementyev
9bec974991
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:34:39 +00:00
Dmitry Dementyev
7f73a168fe
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:01:01 +00:00
Dmitry Dementyev
4f67ca0cfa
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:39:21 +00:00
Dmitry Dementyev
f56584cd21
Convert argument to intent in AddAccountSettings. am: c7e8052b52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:01:57 +00:00