Eric Biggers
bb149b50b8
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours am: 8360c2e940
-s ours am: 2f8d8d1d79
-s ours am: 3759d6c76e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I43eddfec816ad81e30a9d92fb843ae99fa2766ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 03:26:29 +00:00
Eric Biggers
3759d6c76e
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours am: 8360c2e940
-s ours am: 2f8d8d1d79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: Ia27d17e598d6284c312e9cdfe52d6a7e3f389a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 02:43:36 +00:00
Eric Biggers
2f8d8d1d79
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours am: 8360c2e940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: If8220391370f5485505e0990ed9d71b513a21c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:55:29 +00:00
Eric Biggers
8360c2e940
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I41c8afe636e06554df78cc253b93e6dfea887f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:36 +00:00
Eric Biggers
f41767c07a
Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev am: 00885a8cb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965
Change-Id: Ifd772c48ea27b360826e4e87433edec520c89b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:16:29 +00:00
Eric Biggers
62fa3772ed
RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50f93771bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965
Change-Id: I527deaf07af54d6aba582898d29c06c957eff994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:16:23 +00:00
Eric Biggers
00885a8cb5
Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev
2023-08-08 00:50:18 +00:00
Wenhui Yang
b41875eff3
Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211335
Change-Id: Ie562c88a61db12214c11ee18361781f439abb12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-07 20:13:10 +00:00
Wenhui Yang
c2b7914778
Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev
2023-08-07 19:55:44 +00:00
Matt Casey
3362abc551
Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d3023
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323
Change-Id: I44f59ffc7c97affb13fda2151f950a3844a72d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-07 18:48:10 +00:00
Matt Casey
39715d3023
Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev
2023-08-07 17:56:15 +00:00
Bill Yi
11d947dea5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 0e59758074
-s ours am: b3f9242eac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I276d04e23dfb4ebf4b220ea230925aa94743b37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 09:05:52 +00:00
Bill Yi
73b3372bac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 9fd6cb2657
-s ours am: 989a977c08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I7d0eeb71d096fd98950f416b658d34b76919e554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:44:53 +00:00
Bill Yi
29a4f1128b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 0e59758074
-s ours am: fab61ce9af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I58fa8245451b1781391e79b803f665bcefef9193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:43:33 +00:00
Bill Yi
989a977c08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 9fd6cb2657
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I849cae3eb42f08b897f3efd1067c33b0938b51c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:43:18 +00:00
Bill Yi
b3f9242eac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 0e59758074
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I30985eb65054367e947348f01e183b85f70b2fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:19:17 +00:00
Bill Yi
fab61ce9af
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 0e59758074
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: Id44c8896785823806fff3b659d28e650c5a2475c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:17:55 +00:00
Bill Yi
9fd6cb2657
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I0466cb03318c8f9ff67bd4039adf9d22fcbe7e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 07:56:51 +00:00
Bill Yi
0e59758074
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: Ieb0b6e5f6b38a23bece7bad0a115c3e4eb5e423c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 07:55:45 +00:00
Bill Yi
45eb3572ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I2bf6035ffd109a82ecc2cb743b57bf020cdb3053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 07:11:15 +00:00
Bill Yi
66c20338cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: a1bb52d905
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24317284
Change-Id: I935a8d2761983ee33d40eaa9a3fc86ac96fd4be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 04:14:07 +00:00
Bill Yi
1ea11c23d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 031764a37e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24317284
Change-Id: Id2fd06938020ffb5a4f2431a845ef16e2fc11376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 04:13:36 +00:00
Bill Yi
a1bb52d905
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-05 03:31:44 +00:00
Etan Cohen
a20cb88cf6
Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev am: dca9c6b88f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24285925
Change-Id: I687e5e85223d2b96d60667b1c203bd7264935cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 00:27:43 +00:00
Etan Cohen
dca9c6b88f
Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev
2023-08-04 23:36:38 +00:00
Bill Yi
8dcafba811
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: af43c501e6
-s ours am: b1fd906ca0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: I0a794ab8b693e163c356240b0e2354a3fd4a20c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 21:36:13 +00:00
Bill Yi
788bd701a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: b8f4dd6e0f
-s ours am: a71fa5cbcb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: Ib8f23e44989b7f0bfd060689a9599cff7864e236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 21:29:18 +00:00
Bill Yi
1b5f0de9bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: b8f4dd6e0f
-s ours am: 15cc28174c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: I7d678ad2ed4861198a6f0212251cc58da571c60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 21:27:37 +00:00
Bill Yi
b1fd906ca0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: af43c501e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: I0471e7877dec7ef871218806ab38e37d1e348b62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 20:53:12 +00:00
Bill Yi
a71fa5cbcb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: b8f4dd6e0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: I5ffb7fc9f1f9285984b1b900338d2077a0d2703b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 20:45:40 +00:00
Bill Yi
15cc28174c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: b8f4dd6e0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: I1046b5ffb4a54a95a0f4406038b7c9862b137563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 20:44:19 +00:00
Bill Yi
f30fab1202
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f
-s ours am: 5d99f9e9c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24319518
Change-Id: I7b03d44f414fd4ff2b3b32f73c658fdb8fc8590e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 20:17:30 +00:00
Bill Yi
af43c501e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: Ic9e098c8e0a6efbcc02f159772638b6549dc139f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:58:50 +00:00
Bill Yi
109fb512b3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f
-s ours am: b8d9ca8b86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24319518
Change-Id: I6059189741ee34ac105c261d991910250d2edbb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:55:47 +00:00
Bill Yi
b8f4dd6e0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: Id9b01d4dd30afbe01e3777c89da2a3db86943ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:54:35 +00:00
Bill Yi
b8d9ca8b86
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24319518
Change-Id: Ia9d027022ed5817aa9eaca923edd1161f1b6c1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:36:33 +00:00
Bill Yi
5d99f9e9c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24319518
Change-Id: Ib39e135bf9f52b9a0ef8019c3a48d1e062138afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:35:31 +00:00
Bill Yi
f3ddb4a624
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: If487bb3281585de22121dd4240bb566be4584ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:15:48 +00:00
Liahav Eitan
daf168e2b9
Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev am: 804104ce36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23845009
Change-Id: I92f8814c34e868d93500c137a2d4428937d50320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 18:02:56 +00:00
Liahav Eitan
804104ce36
Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev
2023-08-04 17:19:02 +00:00
Weng Su
cac69880ae
Show policy transparency dialog for Wi-Fi network restrictions am: 28be567a83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156648
Change-Id: I5e5ebdc0aedc686e7a4257458d68592ea51c883b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 16:36:08 +00:00
Weng Su
28be567a83
Show policy transparency dialog for Wi-Fi network restrictions
...
- In order to support various user restrictions of individual Wi-Fi networks, WifiEntry provides the hasAdminRestrictions method for unified management.
- Settings will refer to WifiEntry#hasAdminRestrictions to restrict individual Wi-Fi networks.
Bug: 289448751
Bug: 289951241
Test: manual test
atest -c LongPressWifiEntryPreferenceTest
Change-Id: Iae5996a87ee72a3073300c7f62dfa14a9f31c21d
2023-08-04 07:18:28 +00:00
Yu Chao (zhào-yò)
c9eca99ac1
Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev am: 8053947766
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24305937
Change-Id: I92ce6470673a5c7d36dd188bdb80902cb1103901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 07:01:45 +00:00
Yu Chao (zhào-yò)
8053947766
Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev
2023-08-04 06:28:05 +00:00
Yu Chao
68e466ff01
Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment.
...
This is required for adding an overlay vpn_settings2.xml for Tips
Button.
Test: VpnSettingsTest
Bug: 293213974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f9ca569249331a062e6f58a49bb0bb53aa69b3db )
Merged-In: I26531afe75215c9531c0122d2e86fd5d0da4d3db
Change-Id: I26531afe75215c9531c0122d2e86fd5d0da4d3db
2023-08-04 05:51:48 +00:00
Bill Yi
d56eb42615
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I88df717cf88e78ce5cbe17b53f50dbccf03aecf2
2023-08-03 20:29:24 -07:00
Bill Yi
74fd980e5f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9dc5389350ec7cb3c1988eb69fc5c23c5c50707d
2023-08-03 20:27:38 -07:00
Bill Yi
d447dcfcea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36696445b89cb0d0dd94aa210d559a6c60a79d82
2023-08-03 20:21:12 -07:00
Justin McClain
e214825dfa
Merge "Adding test directory owners file." into main am: e354820db7
am: b3c19b8057
am: 1f656a8734
am: d31a0c8d22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2692366
Change-Id: I3973e5f5ef8edc2747146024e5d77b7f6abb4b17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 03:14:25 +00:00
Zoey Chen
2a2a50e4f2
Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev am: 9635d1cf45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24257533
Change-Id: I7f82cb95528fe96829f896ee5cb762ab401dd0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 02:54:30 +00:00