PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,934 Commits 1 Branch 0 Tags
76b51c0d5704f3e1ef53a377986900244ed6da3c
Commit Graph

84934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
76b51c0d57 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: I3068e68b02de218d9defca06faf4e19f974f48ea
 2021-08-07 00:21:48 +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
Bonian Chen
15870af85b Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Ieeda02e359feb275a88fda113fe33a9639af41ee
 2021-08-06 03:31:28 +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
4cb88993aa Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Ie3627c5baadba7b0968ed7495a597fbe9ef80f60
 2021-08-05 21:50:26 +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
4464b58412 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours am: b6321f88ad -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: Id3af84dc33ed419874ed614c5ccf01570c454114
 2021-08-05 05:50:22 +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
926e66633c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours am: 2a1b39c51f -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: I84148729c7a91e5d886721936b5a4a88a6e81f63
 2021-08-05 05:16:35 +00:00
TreeHugger Robot
25b204f3db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a068c58c62e8b0e3b5ec2dcbe1a69e1f6029d20
 2021-08-05 05:16:31 +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
a11e5bea20 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-05 05:04:34 +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
e1215a0076 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie6e1199c352f2d98b0381565375fcf7330ee70cc
 2021-08-05 02:34:25 +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
0d61ec8ebf Merge "Fix text styling for choose pattern/password screens" into sc-dev am: 66a2f625e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463175

Change-Id: I7c40fd94251b22a6c97356522d0ae302f0c3e652
 2021-08-04 23:55:54 +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
429dc94cfa Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091

Change-Id: Id9bfd7d9b9668d8fdeb0251902c1002a99ff833e
 2021-08-04 18:06:15 +00: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
1741a0bd6c Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816

Change-Id: Ie4cfa9b52049abd6e8e4fb5f152cecbed0c602ab
 2021-08-04 07:29:18 +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
c76d3e5af7 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I9d2c3c9daf090f26244f42b730507ba64a279500
 2021-08-02 21:27:44 +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
295b1bb97b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -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: Iec3a965e95f539c618044b241380e9af19dc20a6
 2021-07-30 14:53:05 +00: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
54f684bdda [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -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: I91104e537f92974876be8d590f01db23257fdb48
 2021-07-30 14:21:12 +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
243ae3b151 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a7ac84fbdc83e0e2b7facfe8a157a82282d0cd0
 2021-07-30 14:16:34 +00:00
TreeHugger Robot
57d9cf9f25 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-30 14:15:01 +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
99ef4ec5fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iab11c36fd772ae3aefc76bf063199db279be2450
 2021-07-30 11:42:43 +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
f719dd7a6c 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: Iede0416114c004a9f66c8a93fdd05cd22d53ff26
 2021-07-30 08:32:02 +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
cd50557c3f 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: If4c0396b8b89dae066a9c44f4adc31f14139e7a7
 2021-07-30 01:36:02 +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
4f253570f8 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: I49aff7021bff62248bb48e4be01f522c60fcec44
 2021-07-29 20:01:04 +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
9409d32ef7 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: I919eb96cae9c555e8cf37ad157ef9690e4bce8fd
 2021-07-29 15:21:07 +00:00