Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,819 Commits 1 Branch 0 Tags
e7ebddb87d937d8d24f2321c41230e8ab87f3721
Commit Graph

38389 Commits

Author SHA1 Message Date
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
e8b42fbf1b Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I09932874d5c45b1570d0fd83a8f8b1aad4b43108
 2021-08-10 06:12:23 +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
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
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
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
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
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
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
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
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
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
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
b40dabe916 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: Idc444434a9c06cb1890b147c06fa6cf084beb401
 2021-08-04 07:30:00 +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
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
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
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
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
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
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