PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,831 Commits 1 Branch 0 Tags
c27be2ae19d18b09c53857356bd2f741cee50ecc
Commit Graph

86831 Commits

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

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

Change-Id: I518e2da6eb8ad559ebc414bd4ec03d4d0ee29f7b
 2021-08-10 06:35:42 +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
06c28db36d Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b am: e8b42fbf1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710

Change-Id: I222469918bc674c6a0df8c330a36c2ff72cb8792
 2021-08-10 06:26:56 +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
1d8c6a6188 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: I1b126ab2dabd818a2675d8b2ac26f6a7949e13cf
 2021-08-10 06:13:41 +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
57fba3fd53 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d am: 4d00d08afa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: Iefbac69b97fa0be3869c1439c80f41580815547a
 2021-08-10 03:33:43 +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
Treehugger Robot
1079d2160d Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: Ibe684fce2f0986dc15147085fe58d575be510f87
 2021-08-10 03:07:39 +00:00
Treehugger Robot
fdea2eaffa Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." 2021-08-10 02:54:06 +00:00
Curtis Belmonte
24d5f409e5 Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55 am: 5968c28caf am: 2899c874f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

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

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

Change-Id: Ic957d973f38682ea89d05b47e57f0a79d673ff64
 2021-08-10 00:31:31 +00:00
Curtis Belmonte
5968c28caf 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: I9299449e882dd42a6e5a56d500430e3e3f962ad6
 2021-08-10 00:18:20 +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
TreeHugger Robot
3fe7536a82 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd am: f05653b4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Ic034217cc96493242a06487caaeff4fcdb618e1a
 2021-08-09 20:52:05 +00:00
TreeHugger Robot
9f9829c29d Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd am: 534802b35f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I03cb6c3d06705d61e4d7d488080d74405705472b
 2021-08-09 20:48:31 +00:00
TreeHugger Robot
257e4211b1 Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: a03d9cee0b am: 918adcbfcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: If8141f0cb5193d5884fb7dd8fe226e3085ba62d1
 2021-08-09 20:48:20 +00:00
TreeHugger Robot
f05653b4cb Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I3e97e4135581767de7c83375421ed002afc4b9c0
 2021-08-09 20:35:13 +00:00
TreeHugger Robot
534802b35f Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: b4d5a623bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Iba0f93b0b4e45ad219513adf545835f63f9f299a
 2021-08-09 20:35:12 +00:00
TreeHugger Robot
918adcbfcc Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f am: a03d9cee0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: Ife772033e7d015738ee67a17e2688d6f3977ee69
 2021-08-09 20:34:56 +00:00
TreeHugger Robot
b4d5a623bd Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I3d67364a06f6486e8aab5c7e86100f8aaab85665
 2021-08-09 20:20:18 +00:00
TreeHugger Robot
a03d9cee0b Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615

Change-Id: I016bb3be3c99196c609a41903f3782cc9a73c458
 2021-08-09 20:19:21 +00:00
TreeHugger Robot
9000bdc25f Merge "The wifi dialog text should be Google Sans Text" into sc-dev 2021-08-09 19:59:07 +00:00
TreeHugger Robot
0f157dcc29 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours am: 26710ec44c -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I5b4a29f8eb04364ad1c2a75279ce013869c4766e
 2021-08-09 14:15:25 +00:00
TreeHugger Robot
71bdf0ce4c [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours am: ef72e3b1de -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Icf3a7c8ef5a4031233f727ea69d8c3684eff4ac4
 2021-08-09 13:58:06 +00:00
TreeHugger Robot
ef72e3b1de [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I8124f786900616b262ba7289c7f4524b4adcb7cb
 2021-08-09 13:44:55 +00:00
TreeHugger Robot
26710ec44c [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 869e01eecb -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ib4416d8e7742c40db2be708bf0eb655ad8e9f5ea
 2021-08-09 13:44:55 +00:00
TreeHugger Robot
6915e70c07 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 421e0c398c -s ours am: b84efe7136 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I00e0fe40bc913cf49d9d8df5f0a36757460a3d57
 2021-08-09 13:35:02 +00:00
TreeHugger Robot
d3e3e72923 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours am: 169dc0e55f -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ie77db13e46300d72e630c8b9f7b8773f519653d1
 2021-08-09 13:34:58 +00:00
TreeHugger Robot
b84efe7136 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours am: 421e0c398c -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I3cd040d10545ba96aaec0f9237b922a2bfc66d5f
 2021-08-09 13:34:29 +00:00
TreeHugger Robot
869e01eecb [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: Ia3cf15d66f84dc53d92efab02577ec44a755416c
 2021-08-09 13:25:40 +00:00
TreeHugger Robot
956008279d Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: 84b515396f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I555655ec265b359287093ff840edcfecfe67a5a8
 2021-08-09 13:24:53 +00:00
TreeHugger Robot
421e0c398c [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 876d9ec0dc -s ours am: 88b0676d08 -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I435e93045b3dd0e1512f18ac2a0e7590bb16ac3e
 2021-08-09 13:24:51 +00:00
TreeHugger Robot
72366e30f4 [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 2d742d01f7 -s ours am: 7fccf00f5d -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I91cc1d0a1e0903f6aaa7dfb5f117b6f38f059a7e
 2021-08-09 13:20:59 +00:00
TreeHugger Robot
89a9de3cbd [automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31 -s ours am: 4a3bbeee1a -s ours am: c06aef8e7f -s ours am: 9246df546a -s ours am: b948c4195e -s ours 
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b is already in history

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

Change-Id: I13dccf14127e88ce05738f64cf08e43bbd25b65f
 2021-08-09 13:10:38 +00:00
TreeHugger Robot
8be87a7d0f Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: e7a555d9f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: If17621edde39019e898675773a966af733d1385d
 2021-08-09 13:10:34 +00:00