PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,147 Commits 1 Branch 0 Tags
824f21616b70ffca9b3ce9a613f2902c5246fdbc
Commit Graph

85147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a5517006b3 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: Idb67e48147c633e60c317876abdb19c48fcb90cf
 2021-08-06 03:31:26 +00:00
Bonian Chen
68ac2d69c0 Merge "[Settings] eSIM existance detection rule change" into sc-dev 2021-08-06 03:15:49 +00:00
Android Build Coastguard Worker
fcc000e568 Snap for 7616100 from 60773b9a37 to sc-release 
Change-Id: I2d8299e16d064dc34c797c0ffb3fbab64c097902
 2021-08-06 01:08:41 +00:00
Beverly Tai
6adbe74b92 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: Ic4dd5daa7ec14ebd94d54ac789a9d93c6ff7b556
 2021-08-05 21:50:27 +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
f841d3fa4f [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: If6e7a3f07941a61f16d553f95c13f59529cdcbe4
 2021-08-05 05:50:26 +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
7805fe0aee [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: Ifda89d01ba6bc2fa34a17a24555249e500ded11b
 2021-08-05 05:19:45 +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
ae616ac517 [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: I70099cce49169ab459d5c3bbdc4c2309d6f0e78a
 2021-08-05 05:15:17 +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
Android Build Coastguard Worker
ec2afd121c Snap for 7612197 from 831d1153e9 to sc-release 
Change-Id: Ie706eb3d0dd30e81e12af0ab73f6ef61242b87db
 2021-08-05 01:09:27 +00:00
TreeHugger Robot
26aa201d81 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: Ifb9bdfac1eae934d032f62cc5d0ec57abe61e0b9
 2021-08-04 23:55:03 +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
e098b85711 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: I2f8fdf57c5bf00ffd68861daaf2701ac0c1196c0
 2021-08-04 18:06:10 +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
f42a8893c6 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: I0daddb467799ae48f25a1ecbf2e9b76081f96f1b
 2021-08-04 07:28:12 +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
Treehugger Robot
8f0658f24d [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 am: 93a418718f -s ours 
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: I1ba07ac8c0a20cf6f1422d2be60c00a10e304ba7
 2021-08-04 01:59:51 +00:00
Xin Li
1d2519ade1 [automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours 
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: Ic475987a1d6f0435fb4c4c77e28ada1b687878ff
 2021-08-04 01:59:46 +00:00
Treehugger Robot
93a418718f Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293

Change-Id: I86a2d120881f268b479b8a0e1bda3832fcb867bc
 2021-08-04 01:28:25 +00:00
Xin Li
4785355302 DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293

Change-Id: I1cc9538054669c2c71105d44c8601fb1bf6e8579
 2021-08-04 01:28:22 +00:00
Treehugger Robot
a529d8c717 Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." 2021-08-04 01:05:56 +00:00
Yifan Hong
bbd851fea7 Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
 2021-08-04 00:07:38 +00:00
Yifan Hong
eddbc8a356 Merge "PairDevice to structured Parcelable." am: f7ff663887 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
 2021-08-03 23:46:26 +00:00
Yifan Hong
f7ff663887 Merge "PairDevice to structured Parcelable." 2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
 2021-08-03 16:07:50 -07:00
Yifan Hong
1b586ec8dc IAdbManager.getPairDevices returns FingerprintAndPairDevice[]. 
Map is not supported in C++ backend. To compile IAdbManager in C++,
Map is translated into a list of key, value tuples.

Test: pass
Bug: 190867939
Change-Id: I1a057306161a4f8eaef33e3c40b1db9494aea3e5
 2021-08-03 14:05:32 -07:00
Yifan Hong
d61750990d PairDevice to structured Parcelable. 
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
 2021-08-03 14:05:31 -07:00
Android Build Coastguard Worker
cfc43b2c59 Snap for 7604940 from fdb80de825 to sc-release 
Change-Id: I65ea6457182d4a8cc543d746d59e51d29a024210
 2021-08-03 01:08:29 +00:00
Joe Bolinger
8a8f607218 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: I7912e8ac26ee4c5cd611a8d7e535fb3f4f93d018
 2021-08-02 21:26:51 +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
Android Build Coastguard Worker
42b425d1da Snap for 7599941 from 6deca0cd6b to sc-release 
Change-Id: I218a3a848721871f1847a7624071e5c5dde00df7
 2021-07-31 03:08:38 +00: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
9c72a8c5f6 [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: I73033d1b8888120b77e48edd8ce23eb1beca3b7e
 2021-07-30 14:52:58 +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
2487eee891 [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: I4851fff1d80fbbd507ac78300bed7ae7141d2271
 2021-07-30 14:21:09 +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
b90e48ad64 [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: I536a95a89ff1243f1e87e340b923564f70e7c190
 2021-07-30 14:15:47 +00:00
TreeHugger Robot
7399e2deaa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-30 14:07:33 +00:00