Commit Graph

105453 Commits

Author SHA1 Message Date
Bill Yi
082d0f39ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours am: 2036b1873c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: If89daeeef0f850ebea96138e384d8b099692c34c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:11 +00:00
TreeHugger Robot
868a03b273 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours am: 722272143c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293

Change-Id: I928b177a20dfd288ccacf2512764b3f067f15108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:21:03 +00:00
Bill Yi
59bb14f56e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours am: 26d22ef04d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293

Change-Id: I449a641ddef3e8f3ef0c961be79f23a7da760a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 23:20:56 +00:00
TreeHugger Robot
3de5617a68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: I7a89dc3c0ffad10dec24003198409aad5b174182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:21 +00:00
Bill Yi
2036b1873c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296

Change-Id: I57a2a0dcb836119e48d63874ec6ed77715cab344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:17 +00:00
TreeHugger Robot
722272143c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293

Change-Id: Ic3a2da03399dc35e01360df7c323cb3b5b68808c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:10 +00:00
Bill Yi
26d22ef04d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293

Change-Id: I1286629b18bae7a7a76bd4c96fc3b3d33cf559db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:53:00 +00:00
TreeHugger Robot
725c53880a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
5afb322f3a Merge "Restrict network preferences settings" into tm-qpr-dev 2022-06-06 21:42:30 +00:00
TreeHugger Robot
adde365e6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 4154883a76 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573

Change-Id: I34e6707b67cea4d76a0a8dfeb27998007ff69ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:33:52 +00:00
Bill Yi
7eafff0852 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 14477b9d65 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573

Change-Id: Ie271b0f155ea246b5a9795377e24b8698d00ac16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:33:40 +00:00
TreeHugger Robot
4154883a76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573

Change-Id: I25682928f11c3910529d7b678e5de23135d10386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:16:18 +00:00
Bill Yi
14477b9d65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573

Change-Id: I515632ed85faa537ad76adff45c98b4b1e62f2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:16:04 +00:00
TreeHugger Robot
6769eee779 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-06 21:03:12 +00:00
Weng Su
a09c33f49c Restrict guest user to configure WiFi access points
- If the user is not allowed to configure Wi-Fi access points, close WifiDialogActivity.

Bug: 226133034
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: I32d0c5beceb8a140a98636a5a0af97790495620d
2022-06-07 03:30:01 +08:00
TreeHugger Robot
2487eb86dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745706

Change-Id: If711a5ba7c805cb898ff025288141359d44b3642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 18:55:14 +00:00
Bill Yi
42929a4e42 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: aa1b476569 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745706

Change-Id: Id2483a5f93be4f0f55cdaeacfa635ed20a5b245a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 18:55:04 +00:00
TreeHugger Robot
c24151d95a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3837351d59 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745571

Change-Id: I82543e4ca57e2bf1d9d29f050bb884f4561b2c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 18:54:49 +00:00
Bill Yi
74ada3e8a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b6409fe37 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745571

Change-Id: Ie5e8aec31403e59ecb7ddb1be9bffca958f361d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 18:54:30 +00:00
TreeHugger Robot
18675f81a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
3837351d59 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-06 18:47:52 +00:00
TreeHugger Robot
21b98d4cbf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-06-06 18:41:19 +00:00
TreeHugger Robot
fc5802934b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-06-06 18:41:19 +00:00
TreeHugger Robot
cad01723c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
TreeHugger Robot
b40d530a27 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-06-06 18:40:47 +00:00
Avinash Vadlamudi
5bf8cd7a09 Rename method for better readability
- Rename encircle to encircleUserIcon for proper readability

Bug: 231592331
Test: build, manual check
Change-Id: If9e829372834d8a5f43e4cce358e8c0975fa30eb
(cherry picked from commit 1b7e411315)
2022-06-06 10:03:05 +00:00
SongFerngWang
64430ba2d2 Unable to enable the removable esim
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
Raphael Kim
a3b0938595 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours am: 0a5f62976c -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I8054bc4bd97727920a4af2d2eb74ca7d4019b5af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 09:26:42 +00:00
Raphael Kim
0a5f62976c [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours am: a2b94beca8 -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I985362cf5320eff9611095da1383b605ea0b6cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 09:11:20 +00:00
Raphael Kim
a2b94beca8 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours am: aa31e245ab -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ib29e5d311bf6f13e6ecc06d55d72a56c2d93e246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:53:57 +00:00
Raphael Kim
aa31e245ab [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: 8da96d69dd -s ours
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:32:35 +00:00
Raphael Kim
fbfa9e2df7 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I8e0a51ca890273ffa537f3e94372ba48a8e715d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:15:46 +00:00
Raphael Kim
8da96d69dd Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 08:00:18 +00:00
Hugh Chen
f5166f46e8 RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings
Bug: 233559781
Test: manually test
Change-Id: I175ab126ff92f773ab25a1fa64e4262b324fd353
2022-06-06 07:09:06 +00:00
Hugh Chen
858e6ff3d5 RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings
Bug: 220684478
Test: atest -c VpnSettingsTest

Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-06-06 06:37:26 +00:00
Raphael Kim
d6353487cf Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793

Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1 Merge "Extract app label from component name in notification access confirmation UI" into qt-dev 2022-06-05 01:54:28 +00:00
Android Build Coastguard Worker
d0f3e6eecd Snap for 8683631 from 2acf102055 to tm-qpr1-release
Change-Id: I9fc2864e2cd56b5c91a67fda055ae539cba0d200
2022-06-04 23:25:19 +00:00
Bill Yi
106e52ca92 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I052e09e19a9d145d401e0152346ebe7f0e7f2a36
2022-06-04 01:26:51 -07:00
Bill Yi
96fda27ccb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7b60a0fb4183522545dcf50eae9cd8f1f38a6c1d
2022-06-04 01:23:16 -07:00
Bill Yi
aa1b476569 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic528a7fd27a359811be598d1b08467ee883e7b1a
2022-06-04 01:05:23 -07:00
Bill Yi
4889e1a48d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7b312aeda8014e69b1cfdb82adc97f992d7350ab
2022-06-04 01:01:47 -07:00
Bill Yi
d3dc439a10 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
2b6409fe37 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6476c920020034a0b118ca3d73a10860cd178f51
2022-06-04 00:51:40 -07:00
Bill Yi
84bcd60145 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I978c036f5c669aea8730d5975e3a12f8f91b5bd7
2022-06-04 00:50:18 -07:00
Bill Yi
c36c8eef75 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7907d46ed6cd5416548da57698f32a344f83ba7a
2022-06-04 00:40:55 -07:00