TreeHugger Robot
189d26ff2a
Merge "Add comment to AndroidManifest" into qt-dev
2021-08-07 17:18:31 +00:00
Weng Su
8df9b236f8
Add SafetyNet logging am: 62041d683b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220072
Change-Id: I5a821a0c9bd39e0267635ebfb7ce4a2234f14696
2021-08-07 15:02:15 +00:00
Weng Su
fa62e69c1d
Add permission checking to WifiDialogActivity am: 8800cdf527
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212404
Change-Id: Iaa937ab9fe9b071fa27dd9306e9f28ddbd8a00b0
2021-08-07 15:02:13 +00:00
Weng Su
9bc34092c5
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours am: 7b91612fd0
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: I3694ac5dadb33fc6488631a2b008ec39c0ac9240
2021-08-07 14:14:25 +00:00
Weng Su
4be07137ed
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours am: 052d536e07
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: I02e45b3c9021b7f7d351e8fc9b3a9d7fdfee4c6b
2021-08-07 14:14:21 +00:00
Weng Su
7b91612fd0
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: b659749934
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: I0ffaf1c83a744ae30993c379a244b40f65a2ef04
2021-08-07 14:02:33 +00:00
Weng Su
052d536e07
[automerger skipped] Add comment to AndroidManifest am: fa1e3870d8
am: adf9fffeff
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: Ie0c56032ded21100b3c689922bd03802b6ec9338
2021-08-07 13:58:37 +00:00
Weng Su
adf9fffeff
Add comment to AndroidManifest am: fa1e3870d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: If6e576072291a47fdd7889db1484bf9450786e53
2021-08-07 13:37:05 +00:00
Weng Su
b659749934
Add comment to AndroidManifest am: fa1e3870d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: I00f48e5875c3d60bfa91b61322c36d35b3e38533
2021-08-07 13:37:03 +00:00
Joe Bolinger
fd115c5db2
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: Ic06afcf18cb02b0255d0626891542af0d85de626
2021-08-07 00:22:35 +00:00
Joe Bolinger
336d3e5501
Merge "Fix extra password confirm prompts during managed setup." into sc-dev
2021-08-07 00:07:22 +00:00
Guojing Yuan
11655705db
Remove CDM entries in Connected Device.
...
BUG: 191992001
Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
2021-08-06 23:24:24 +00:00
Bonian Chen
68ac2d69c0
Merge "[Settings] eSIM existance detection rule change" into sc-dev
2021-08-06 03:15:49 +00:00
Beverly Tai
60773b9a37
Merge "Use pattern subtitle string on all enroll stages" into sc-dev
2021-08-05 21:28:22 +00:00
Joe Bolinger
c11e01f39d
Fix extra password confirm prompts during managed setup.
...
Managed accounts may set the pin/pattern before enrollment begins.
Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
2021-08-05 11:08:48 -07:00
Beverly
c9a609eb6d
Use pattern subtitle string on all enroll stages
...
So the views won't relayout and cause the pattern
to render in a strange way.
Test: manual
Bug: 194368020
Change-Id: If6fd7ade4fd6783fe5d1ef78acc847928e01bd29
2021-08-05 17:17:30 +00:00
Bonian Chen
35df60f316
[Settings] eSIM existance detection rule change
...
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.
2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.
Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94
)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
2021-08-05 06:31:35 +00:00
Bill Yi
b6321f88ad
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491
Change-Id: I49e111e71a2ac12186aa85f0bc37629854a60390
2021-08-05 05:38:19 +00:00
Bill Yi
2a1b39c51f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498
Change-Id: I08425987f5fac8f5d2650e60d3ca4e837ed1d51a
2021-08-05 05:16:27 +00:00
TreeHugger Robot
c47427811f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-05 05:02:21 +00:00
Bill Yi
0b227f30a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28fd41e071cad5ba1955fe0aa17bec63c5d3b92
2021-08-05 02:58:44 +00:00
Bill Yi
1cc662122f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idbf6842dbeed0254bb794514aeed9e8a879ff373
2021-08-05 02:45:34 +00:00
Bill Yi
8a7b2f538d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8dbd19ce27d10100096c6035c5b087ed3f97ca4a
2021-08-05 02:30:41 +00:00
TreeHugger Robot
66a2f625e4
Merge "Fix text styling for choose pattern/password screens" into sc-dev
2021-08-04 23:44:35 +00:00
Curtis Belmonte
6ee789e380
Fix text styling for choose pattern/password screens
...
Test: Manually trigger SUW and set a device pattern
Fixes: 195069195
Change-Id: Ib19fd0e827af5bdc0896ab4c8cc4fdb8f582cf71
2021-08-04 15:14:38 -07:00
Peter Wang
831d1153e9
Merge "Update broadcast intent string to correct format" into sc-dev
2021-08-04 17:54:03 +00:00
TreeHugger Robot
6f1bc2f52e
Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev
2021-08-04 07:16:35 +00:00
Joe Bolinger
fdb80de825
Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev
2021-08-02 21:15:40 +00:00
Hugh Chen
a3a0661d1b
Fix "USB tethering" will auto turn on then off when turn off "USB tethering"
...
This CL only updates the "USB tethering preference" when
onTetheredInterfacesChanged() is invoked to avoid the
"USB tethering preference" being changed when received
non-tethering change intent.
Bug: 185590309
Test: make -j42 RunSettingsRoboTests
Change-Id: Ifed9f5c7edef670eeb21baf3841999382ee10ff2
2021-08-02 10:34:56 +08:00
Joe Bolinger
d5ea0ffe67
Skip enrollment when unicorn account is launched by setup wizard.
...
Bug: 194244555
Test: manual
Change-Id: Id310c5e4dec1b1c5262c9703259223ce21b1da61
2021-07-30 12:51:02 -07:00
Bill Yi
6deca0cd6b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428746
Change-Id: I02489ddc8a2047d651d7bf64ff98a75c6c90cd6a
2021-07-30 14:42:43 +00:00
Bill Yi
16693aaca0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15428749
Change-Id: I472c9c04799848a0382c2af447d442b73bad4bd0
2021-07-30 14:16:37 +00:00
TreeHugger Robot
7399e2deaa
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-07-30 14:07:33 +00:00
Bill Yi
63c32865cc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I66bde249f1f3d460a40ccd3fb9daf61f7be202dd
2021-07-30 12:06:46 +00:00
Bill Yi
296d41309e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e84b422b86e7195aac236b569828f1a0760ad7e
2021-07-30 11:53:32 +00:00
Bill Yi
e5d2e077c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
2021-07-30 11:39:05 +00:00
TreeHugger Robot
74060d3158
Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev
2021-07-30 08:18:01 +00:00
Joe Bolinger
12e161d1dc
Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev
2021-07-30 01:21:55 +00:00
Joe Bolinger
91d7545826
Limit biometric enrollments when Unicorn account is present.
...
This prevents biometric enrollment from happening after consent
has been obtained and is being managed by family link.
Note that this requires a corresponding change the setup wizard app
to work in most cases.
Bug: 193577587
Test: manual (enroll then relaunch SuW and repeat)
Change-Id: If260e49f38a141931d7f3362c1faf80ee7790232
2021-07-29 15:43:04 -07:00
Evan Severson
405fac1ca0
Merge "Set toggle state for profile group" into sc-dev
2021-07-29 19:45:59 +00:00
TreeHugger Robot
68d15388f4
Merge "Update the "Location services" header to be sentence case" into sc-dev
2021-07-29 15:06:45 +00:00
Yu-Han Yang
1043fd1cf5
Update the "Location services" header to be sentence case
...
Bug: 191300716
Test: string update only
Change-Id: Ib1194847b9d2b817fa1b8581dc62cd2c1d85da26
2021-07-28 13:01:18 -07:00
SongFerngWang
1bcba3d23f
Fix the wrong comparison
...
Bug: 173387374
Test: atest NetworkSelectSettingsTest (PASS)
test on real device (PASS)
Change-Id: Ib1135b0457b4e35db67e671cad142657457d6d75
2021-07-28 14:15:31 +00:00
Bonian Chen
3f0dc952ac
[Settings] Allow disabled SIM to be controlled in UI
...
Disabled SIM are hidden from UI due to the API only check if there's a
SIM with mobile data capability active within device.
Right now, the UI design has been changed. The UI here should be
accessible no mater with or without the support of mobile data.
Bug: 193820245
Bug: 194761536
Test: local
Change-Id: I9c8b8fa16e74cd0fe4419966cc97ad55b5b87b17
(cherry picked from commit 847f326cd4
)
(cherry picked from commit a8ce9abde7
)
2021-07-28 11:58:23 +08:00
Zoey Chen
1a6982f195
Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev
2021-07-28 03:21:12 +00:00
Zoey Chen
9894f347f2
[BackupCall] The toggle doesn't work when try to disable/enable it.
...
Bug: 192060713
Test: atest NetworkProviderBackupCallingGroupTest
Change-Id: I250c321d682f77e95967824ec033dd3c1ea64b65
2021-07-28 09:11:05 +08:00
Peter Wang
039b99acd9
Update broadcast intent string to correct format
...
Bug: 179949381
Test: Build
Change-Id: If6f97c8c5b73c8b00cf448763dee84940d026379
2021-07-27 17:15:26 -07:00
Joe Bolinger
7e9077fd14
Merge "Use RestrictedPreference for all biometric settings." into sc-dev
2021-07-27 17:25:25 +00:00
Bill Yi
1c95bda96f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394296
Change-Id: I6623f4d49330b78682638bb8f825959a4d3c6a8b
2021-07-27 06:59:05 +00:00
Bill Yi
12f186ff22
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394299
Change-Id: I1e9b9d78e302e5b5974476cba9a88407f7bcb73e
2021-07-27 06:36:44 +00:00