Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,292 Commits 1 Branch 0 Tags
813d923c2a1ca7152cbc5bb6a2f667742f6e8db7
Commit Graph

39124 Commits

Author SHA1 Message Date
TreeHugger Robot
682bddef70 Merge "Use NEW_TASK|CLEAR_TOP when launching emergency app" into sc-v2-dev am: f923361f32 am: 5fadabee0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505710

Change-Id: I6fea6f374407a5288001bfac195dfc669c913cd2
 2021-08-10 08:59:41 +00:00
TreeHugger Robot
5fadabee0d Merge "Use NEW_TASK|CLEAR_TOP when launching emergency app" into sc-v2-dev am: f923361f32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505710

Change-Id: I4f4f23b869a204c8bfa0f4f8ce683ddbbe563285
 2021-08-10 08:50:50 +00:00
TreeHugger Robot
f923361f32 Merge "Use NEW_TASK|CLEAR_TOP when launching emergency app" into sc-v2-dev 2021-08-10 08:39:11 +00:00
Tom Hsu
e8d060a95a Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: 1d8c6a6188 am: 2c6cd5b6d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: Id942def631ce2476267040245196e258a84e6f3c
 2021-08-10 06:35:22 +00:00
Tom Hsu
2c6cd5b6d1 Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: 1d8c6a6188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: Ia9625410ec4aadb5c5ad7111c2b50190819c5c86
 2021-08-10 06:26:49 +00:00
Tom Hsu
0eb9547599 Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: 1d8c6a6188 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I01cc1d45fb1a630345a45116078838848d254076
 2021-08-10 06:26:45 +00:00
Tom Hsu
636c14786c Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: 8bf7bd3d0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I9c646d98ab58eb5872b13b5d427d2a59cc3dced5
 2021-08-10 06:26:02 +00:00
Tom Hsu
939136b34b Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev 2021-08-10 06:00:44 +00:00
Tom Hsu
a17fc042dd Selects a active sim to MobileNetworkActivity w/o subscription ID input 
Bug:194754151
Test: Sanity test with test build. See b/194754151#21

Change-Id: Ic3449392a7f564b69c3f42cc762ec4c9ec642797
 2021-08-10 04:40:52 +00:00
Treehugger Robot
4cfaa7d957 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d am: 4d00d08afa am: 57fba3fd53 am: deeda01639 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: I3ae58ec64af90800c4393bd22993d5214070753f
 2021-08-10 04:08:06 +00:00
Treehugger Robot
deeda01639 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d am: 4d00d08afa am: 57fba3fd53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: I62e69b314022da7b731a0ce5ef3e8baccd7404a7
 2021-08-10 03:50:20 +00:00
Treehugger Robot
4d00d08afa Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: I2c4e3487ce8295d6058a096a446c0014080407c2
 2021-08-10 03:19:55 +00:00
Curtis Belmonte
bc992403c9 Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: e2cecc12ce am: d03beb3b3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: I08b9de996c24f81aa32dcdc22b2de7463e0e79e6
 2021-08-10 00:45:53 +00:00
Curtis Belmonte
2899c874f9 Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: 5968c28caf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: I6e7f9d3bbcc76d243713c10b87f4817ebf2118c4
 2021-08-10 00:31:51 +00:00
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
e2cecc12ce Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: Ide0d2b21c96a12f0a597ece182d5bf4631df4286
 2021-08-10 00:17:34 +00:00
Curtis Belmonte
4cb6d12b55 Merge "Make face education handle timeout result correctly" into sc-dev 2021-08-10 00:06:17 +00:00
Fan Zhang
2a3920e44d Use NEW_TASK|CLEAR_TOP when launching emergency app 
This flag combination will attempt to go to the existing emergency app
task stack instead of creating duplicate ones.

Fix: 193108390
Test: manual
Change-Id: Ia9c9ead4e8b1d27582cdaff3e4d42c762e80709a
 2021-08-09 22:54:21 +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
0560b36964 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: 0b705abada am: 8d0ad43149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: Icdb6dd28c9aebea739928d4cd72fc0723820717d
 2021-08-07 00:53:39 +00:00
Joe Bolinger
59f46b4385 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce
 2021-08-07 00:39:30 +00: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
0b705abada 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: I2cebeaef5456520f8d4a40fa20c6c8f469007218
 2021-08-07 00:21:37 +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
ea9c9df826 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0 am: 23f97347a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: I98572de38df258b03c812f82787555f84106df0a
 2021-08-06 03:47:15 +00:00
Bonian Chen
23f97347a3 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: Ia86d71fb7b70dc1ff9c6ff4d2b902b09baf736b2
 2021-08-06 03:32:23 +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
Beverly Tai
63a72d90a6 Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 am: 88364551db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Iaa6271766812e0c1746dd6688db22f9225c7ea6a
 2021-08-05 21:59:48 +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
88364551db 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: Iff92c4d045ee1e6997109d5c475337ba4cbb7b00
 2021-08-05 21:51:11 +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
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
41eab93b70 Merge "Update broadcast intent string to correct format" into sc-dev am: 831d1153e9 am: 44ed1b24f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15406091

Change-Id: I82c4c78e8b9876ca2851b3388cfe1d4a3d9b0f32
 2021-08-04 18:52:58 +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
44ed1b24f8 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: I030fa95efa6105bced4592e15cc7b07b5722d757
 2021-08-04 18:07:06 +00: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
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
91321b329a Merge "Fix "USB tethering" will auto turn on then off when turn off "USB tethering"" into sc-dev am: 6f1bc2f52e am: b40dabe916 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258816

Change-Id: I8c6d26177c24f8670db66dd04c52623ab224949d
 2021-08-04 07:42:53 +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