Commit Graph

39092 Commits

Author SHA1 Message Date
Curtis Belmonte
193f7dfc3a Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: fbcd660844
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: I2ec279a412b7b452270518bc063106d4bd5cbf78
2021-08-10 00:31:05 +00:00
Curtis Belmonte
4cb6d12b55 Merge "Make face education handle timeout result correctly" into sc-dev 2021-08-10 00:06:17 +00:00
Curtis Belmonte
ea07bb8d2f Make face education handle timeout result correctly
Ensures that a result code of RESULT_TIMEOUT always causes the face
enroll education screen to finish and propagate the result.

Test: Lock and unlock screen at each stage of face enrollment

Fixes: 194857793
Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f
2021-08-09 14:12:45 -07:00
Joe Bolinger
087078208c Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: 76b51c0d57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I347fa7ed007573a1b83ba84d1ecb3ac48c9d2caf
2021-08-07 00:38:53 +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
68ac2d69c0 Merge "[Settings] eSIM existance detection rule change" into sc-dev 2021-08-06 03:15:49 +00:00
Beverly Tai
46c330617a Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 am: 4cb88993aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: I21e0a8eb21ce39e4186c275a9096d1c490b24a36
2021-08-05 21:59:24 +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
Julia Reynolds
17dda0faec Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference." 2021-08-05 20:34:13 +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
alinasuarez
1031bb2693 TARE Global Toggle
Add functionality to the global toggle within the TARE homepage in the
developer settings. This allows for users and developers to turn these
settings on/off.

Bug: 195552339

Test: Manual (open Settings > System > Developer Options > TARE > turn
on/off the global toggle and leave and go back and make sure it is being
kept track of correctly)

Change-Id: Ifb8dee1aeb04d2b6883ee9e449ed8ab0493dc27a
2021-08-05 15:33:52 +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
Bonian Chen
8db6e5ac5e [Settings] Fine tune log output and code comments
Adjusted log output and code comments.

Bug: 195090132
Bug: 195091953
Test: local
Change-Id: I37ccd641c313e1ffafa600fffe7ca7eaf287db88
2021-08-05 01:59:27 +00:00
TreeHugger Robot
3ce7245736 Merge "Revert to Default Settings" 2021-08-04 23:29:18 +00:00
alinasuarez
e2d2f44888 Revert to Default Settings
Add functionality to the revert default settings button. This currently
writes a null value to the ENABLE_TARE constant. In the future this will
also make the AlarmManager and JobScheduler constants null so that the
default values are used instead of custom config values.

Bug: 195543827

Test: Click on revert to default settings button, check that the value
for ENABLE_TARE is null by running "adb shell settings get global
enable_tare" in the command line

Change-Id: I558e8f1121021eca3224e4bc9b26bbe0dd2467c7
2021-08-04 20:39:09 +00:00
Peter Wang
b9db3d3a04 Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9 am: 429dc94cfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091

Change-Id: I252e0b00a54d5d31f1419b58261e3c8c3fed3b64
2021-08-04 18:52:36 +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
cbacb4aec0 Merge "Handle blobs and leases that never expire correctly." 2021-08-04 16:05:31 +00:00
TreeHugger Robot
a59a192625 Merge "Job Scheduler TARE page implementation" 2021-08-04 15:54:12 +00:00
TreeHugger Robot
c3d193572f Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e am: 1741a0bd6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816

Change-Id: I7315ee315f79f8ec724353621aac9b82b3f71837
2021-08-04 07:42:27 +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
Yifan Hong
045354fa8c Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 am: bbd851fea7 am: e3aecc8290
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

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

Change-Id: I2c334127de069f834cf4d955ac18cf0df4ed5f83
2021-08-04 00:22:13 +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
d61750990d PairDevice to structured Parcelable.
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
2021-08-03 14:05:31 -07:00
Varun Shah
eefce6a1f3 Handle blobs and leases that never expire correctly.
Add logic to properly handle blobs and leases that never expire.

Also add the relevant strings required in this package.

Fixes: 194439893
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest
Test: manual (visual)
Change-Id: Ifeb216a92a3be8d1db3574b4f63e2d04adace4ea
2021-08-03 12:09:14 -07:00
Bonian Chen
e421a7265d Merge "[Settings] eSIM existance detection rule change" 2021-08-03 13:12:20 +00:00
Bonian Chen
848d097b94 [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
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
2021-08-03 11:04:27 +00:00
alinasuarez
8073d4eb92 Job Scheduler TARE page implementation
A Job Scheduler policy page is needed in the TARE developer options
settings to allow developers to both view and edit the current values of
all the factors under the job scheduler policy. The page uses a dropdown
so that the user can easily switch between the different policies. For
the factors with subfactors, the user simply clicks on the factor and
the subfactors wil pop up under it.

Bug: 191877052

Test: Manual (open Settings > System > Developer Options > TARE >
JobScheduler and verify all factors are there)

Change-Id: Icea6cda5e4b59d1736f85defcb9532839c3720f5
2021-08-03 02:26:19 +00:00
Joe Bolinger
b67ebf0c5c Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 7324d75b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: Ifc1a660def75b1b781b40dae6da9e3e608e0ef7a
2021-08-02 21:44:10 +00:00
Joe Bolinger
7864beaafd Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: c76d3e5af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I15f97e1dee53c996e294b70b924e5949cfbd0f61
2021-08-02 21:43:53 +00:00
Joe Bolinger
7324d75b4f 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: I0fda8c0922e45b45a4fb2b10431289724ea26851
2021-08-02 21:28: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
TreeHugger Robot
32ef854a8d Merge "Alarm Manager policy TARE page implementation" 2021-08-02 19:37:17 +00:00
alinasuarez
aef6ac2889 Alarm Manager policy TARE page implementation
An alarm manager policy page is needed in the TARE developer option
settings to allow developers to both view and edit the current values of
all the factors under the alarm manager policy. The page uses a dropdown
so that the user can easily switch between the different policies. For
the factors with subfactors, the user simply clicks on the factor and
the subfactors will pop up under it.

Bug: 191876714
Bug: 191876567

Test: Manual (open Settings > System > Developer Options > TARE > Alarm
Manger and verify all factors are there)

Change-Id: Ie036e26df80947d23041bedfd5b1385e48069b6b
2021-08-02 17:39:36 +00:00
Wu Ahan
bad7c0c89d Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev am: 661d1d1a1b am: 9eff6c3d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258554

Change-Id: Ia943585cd70be1d027f9e91ffb20d610c5572a3e
2021-08-02 10:33:28 +00:00
Wu Ahan
9eff6c3d77 Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev am: 661d1d1a1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258554

Change-Id: I30dc96c202caf1895bcd3099ddd460d8c834a825
2021-08-02 10:23:59 +00:00
Wu Ahan
661d1d1a1b Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev 2021-08-02 10:06:03 +00:00
Jason Hsu
05c7ed1d05 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: f38931fd98 am: 02990f7470
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15401732

Change-Id: I777d6dbba30b3da7308ce998e3aeefbbbd298bba
2021-08-02 06:34:11 +00:00
Jason Hsu
02990f7470 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: f38931fd98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15401732

Change-Id: I8e2444b9cb74262298dd290adeaf783198901cb1
2021-08-02 06:30:11 +00:00
Jason Hsu
f38931fd98 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev 2021-08-02 06:25:41 +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
TreeHugger Robot
637f826dcf Merge "TARE string clarification" 2021-07-30 14:55:51 +00:00
TreeHugger Robot
91abd1277d Merge "[Settings] Allow disabled SIM to be controlled in UI" into sc-dev am: 74060d3158 am: f39f9d2d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15388307

Change-Id: I40408cecd02422f1fa41ece7f160637294d172ca
2021-07-30 08:44:57 +00:00
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
bc39d7f73e 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: Ic9337fe64ae71afa60bbe6d8e3ef4a2a511b6cd9
2021-07-30 08:30:58 +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