PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,800 Commits 1 Branch 0 Tags
f39f9d2d3d4647b5fea51a582d095fb38862c866
Commit Graph

83800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f39f9d2d3d Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I3587d9793b6e62402603f2d0a7ffa66c62704b9b
 2021-07-30 08:32:41 +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
769447a502 Merge "Limit biometric enrollments when Unicorn account is present." into sc-dev am: 12e161d1dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15413152

Change-Id: If88427e1b7ed4d5227c821ab65e47f52cc9c5481
 2021-07-30 01:36:43 +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
8a1461a212 Merge "Set toggle state for profile group" into sc-dev am: 405fac1ca0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15362614

Change-Id: I02ba1737c89d0f85012586ead62b0835f67d2397
 2021-07-29 20:01:45 +00:00
Evan Severson
405fac1ca0 Merge "Set toggle state for profile group" into sc-dev 2021-07-29 19:45:59 +00:00
TreeHugger Robot
84286f0ea1 Merge "Update the "Location services" header to be sentence case" into sc-dev am: 68d15388f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15404706

Change-Id: I25d5844d8dd7d58bcc84779441d8984db3efd07e
 2021-07-29 15:21:53 +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
7f69cca1a9 Fix the wrong comparison am: 1bcba3d23f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15403429

Change-Id: I226de23b9e147ccf66cbbc57821b8244991f1363
 2021-07-28 17:05:38 +00: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
b1bd0b6d26 Merge "[BackupCall] The toggle doesn't work when try to disable/enable it." into sc-dev am: 1a6982f195 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372352

Change-Id: Ib65987eb078f9fc0d6995470031d879cc1d8ece4
 2021-07-28 03:41:00 +00: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
Joe Bolinger
70e4c3474a Merge "Use RestrictedPreference for all biometric settings." into sc-dev am: 7e9077fd14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15394293

Change-Id: I39c616c70076dd98e24d138a0459d4914511a677
 2021-07-27 17:43:00 +00:00
Joe Bolinger
7e9077fd14 Merge "Use RestrictedPreference for all biometric settings." into sc-dev 2021-07-27 17:25:25 +00:00
Bill Yi
927010cb2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 187263e4a2 -s ours am: 1c95bda96f -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: I113635f56023acb41302b70bc86f327654ddd00f
 2021-07-27 07:11:44 +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
0c72e5ebb2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 507d6814a4 -s ours am: 12f186ff22 -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: Iecf073eb716e3b95b42e914425551841f2ceb825
 2021-07-27 06:38:34 +00:00
Bill Yi
ef1f1fcb63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 12b1ae00b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44352b938d84b3c0ae344e9e23197ef2a8da85ed
 2021-07-27 06:38:09 +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
Bill Yi
39dcf7b2af Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I679b7a76538b3e94f2d564bacb6d8db4462d5717
 2021-07-27 03:42:49 +00:00
Bill Yi
12b1ae00b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0d8bd7744e7bcc261f6745c70584860391e423f2
 2021-07-27 03:39:15 +00:00
Bill Yi
507d6814a4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifbfc76908c45f5db6d7eff811d31a3eee810231f
 2021-07-27 03:26:34 +00:00
Bill Yi
187263e4a2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idc5958063a2353ecaf65a34be2c76d0c4ca8f8f5
 2021-07-27 03:12:55 +00:00
Joe Bolinger
61d998406d Use RestrictedPreference for all biometric settings. 
Fix hardcoded preference key in settings controller.

Fix: 194708564
Bug: 194246380
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I86bdd40fd848c5ba2d39acfde4771f5969e640d1
 2021-07-26 18:36:32 -07:00
Peter Kalauskas
6804d23658 Merge "Fix: change owner name when account setup" into sc-dev am: c9076d3d36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15377999

Change-Id: I72de49d2efd13e19160a5387bd7947e111e5aa27
 2021-07-26 15:09:41 +00:00
Peter Kalauskas
c9076d3d36 Merge "Fix: change owner name when account setup" into sc-dev 2021-07-26 14:52:29 +00:00
TreeHugger Robot
7993875a8e Merge "Use correct user ID for face bypass pref controller" into sc-dev am: ae23247270 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15379629

Change-Id: I29147e9d2400dbdccde9c63f15deb79240a2dd66
 2021-07-24 19:00:27 +00:00
TreeHugger Robot
ae23247270 Merge "Use correct user ID for face bypass pref controller" into sc-dev 2021-07-24 18:46:18 +00:00
Curtis Belmonte
43f2be2059 Use correct user ID for face bypass pref controller 
Ensures that the lockscreen bypass preference toggle shown on the face
unlock settings screen always uses the correct user ID. This fixes an
issue where the preference toggle for a guest user would use the
primary user's setting when multiple biometrics are supported.

Test: Manual:
1. Turn on Settings > System > Multiple users > Use multiple users
2. Add a guest account and switch to it
3. Enroll a face for Face Unlock on the guest account
4. From the Face Unlock settings screen, toggle "Skip lock screen"
5. Ensure that face bypasses lock screen iff this toggle is on
6. Switch back to the owner account and repeat steps 3-5

Fixes: 193488905
Change-Id: I2da4ce466fe0446cccc9119c90bd322daf627339
 2021-07-24 09:20:08 -07:00
Tom Hsu
50cacb7ef4 Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev am: d3d3161695 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15372364

Change-Id: I96fa216a724ac84aeb9f8eba05c1d709fc9e701d
 2021-07-24 06:42:40 +00:00
Tom Hsu
d3d3161695 Merge "[Settings] Fix problem that MobileNetworkActivity show wrong Info." into sc-dev 2021-07-24 06:32:37 +00:00
tom hsu
01f43ff290 [Settings] Fix problem that MobileNetworkActivity show wrong Info. 
- UiccSlotInfo only provide current active slots. It doesn't provide
 inactive slot. Thus,it should not use it for checking sim existed.

Bug: 194022251
Bug: 194378040
Test: Maunal test
Change-Id: I00a3fcf3f700bee804bad12039d6d13a1404cc74
 2021-07-24 05:34:07 +00:00
TreeHugger Robot
9e9c9abad7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48 -s ours am: 2308651946 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie53dfcbeeb6b72e15a39366883c042ee4e018dfa
 2021-07-24 02:40:01 +00:00
Bill Yi
aa1a97f80b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27 -s ours am: 9de075b836 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8fa80d1ba4a6882f8e2fbedf7d1b7dfd39f3524e
 2021-07-24 02:39:55 +00:00
TreeHugger Robot
231062e17d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1 -s ours am: e34a6626b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62b07f694fdae07acb505441db17c3f5431e4daa
 2021-07-24 02:39:50 +00:00
Bill Yi
db6ade8812 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6 -s ours am: 4fa6d75375 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd2499ac3efb3faafdb31eb3a6379ac347a99d7c
 2021-07-24 02:39:44 +00:00
TreeHugger Robot
2308651946 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fea4293f48 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e8dcd75f5d6131f42de5a5146b42a6fe943c4cc
 2021-07-24 02:33:32 +00:00
Bill Yi
9de075b836 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a14938cc27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64d1291ce7b0b692ae03a7e2089224de4f0b4268
 2021-07-24 02:32:55 +00:00
TreeHugger Robot
e34a6626b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: aee1431fd1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d8d1b53b5e7fad1e7d75f3c3be612932147feaa
 2021-07-24 02:26:29 +00:00
Bill Yi
4fa6d75375 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3da976f8b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25a4f07d88a0a992468a3455853e3fc93b088958
 2021-07-24 02:26:22 +00:00
TreeHugger Robot
fea4293f48 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-24 02:23:43 +00:00
TreeHugger Robot
ef50a1ed15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7dd70398eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I58ad1c782f5a1f4b9e6a534b633e67412cf7b8f5
 2021-07-24 02:22:23 +00:00
TreeHugger Robot
39f0224620 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: bfd21817e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I215a194a434dad1e7442c4fe9471bf0e525d65c5
 2021-07-24 02:22:17 +00:00
TreeHugger Robot
aee1431fd1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-24 02:18:54 +00:00
TreeHugger Robot
7dd70398eb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-24 02:14:45 +00:00
TreeHugger Robot
bfd21817e8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-24 02:06:59 +00:00