Bill Yi
b2ee12d3ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2af1bc241cee19780b9c3b5547fc515de9adc201
2021-08-10 15:27:25 +00:00
Bill Yi
2c121e8336
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I905ee0fb3da18a7bd2311f97da60b7735a36678a
2021-08-10 15:23:37 +00:00
Bill Yi
9afb31107a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5074ca0e1eaf4d59504e5c80a50879f8a87dc65d
2021-08-10 15:19:19 +00:00
Bill Yi
c8bb1d57d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie5ba752738776fe16d802cb3a87cdff5da5f6481
2021-08-10 15:08:45 +00:00
Bill Yi
0795b69761
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5316e5b9c6631087c7fb44f88389b3a3086640ea
2021-08-10 14:57:45 +00:00
Bill Yi
5cc24b1fc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9007a25abc0b77eae5dff3bb6c3e14bfcaa1c92
2021-08-10 14:53:51 +00:00
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
0fd01212ca
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
am: 1d8c6a6188
am: 0eb9547599
am: 1644f49f8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: Iddc9d1630f9e52adfac7d8d14aceb4fbc078080d
2021-08-10 06:46:02 +00:00
Tom Hsu
61303648a6
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
am: e8b42fbf1b
am: 06c28db36d
am: 965a1fe63f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: I6f8172dd657f05a1ef73eef904ae371fd19b01ad
2021-08-10 06:45:48 +00:00
Tom Hsu
c61d12889d
Merge "Selects a active sim to MobileNetworkActivity w/o subscription ID input" into sc-dev am: 939136b34b
am: 1d8c6a6188
am: 2c6cd5b6d1
am: e8d060a95a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498710
Change-Id: I39c08af349525d69409cfb537f86575e87502324
2021-08-10 06:44:53 +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
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
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
8bf7bd3d0a
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: I41e2327bbf3797c51acc51dd2db771e4cac49ebb
2021-08-10 06:12:56 +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
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
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
b48b23775c
Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
am: 5968c28caf
am: 2899c874f9
am: 24d5f409e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151
Change-Id: I10f0f0048952cc12e3d41aa2ce3fab2eaf366d5d
2021-08-10 01:05:42 +00:00
Curtis Belmonte
d1f5ac19ea
Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
am: 5968c28caf
am: 9899b404dc
am: e4aabc8da3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151
Change-Id: I6e1c49b28ef9eb185785beaa33f5411e4f254dea
2021-08-10 01:05:30 +00:00
Curtis Belmonte
fc793c73bf
Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55
am: e2cecc12ce
am: d03beb3b3b
am: bc992403c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151
Change-Id: I860f0dde43ed5d692e2f0029f5d771a3e7a14936
2021-08-10 01:05:16 +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
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
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
fbcd660844
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: Id3fb264f35ca20856926774c74ebe104e4d382b5
2021-08-10 00:17:41 +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
0ef977bc91
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
am: b4d5a623bd
am: f05653b4cb
am: 3fe7536a82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: Ia3e5a8075d5b34b6763abad115941694e79800fd
2021-08-09 21:00:18 +00:00
TreeHugger Robot
4b9862ef47
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
am: b4d5a623bd
am: 534802b35f
am: 9f9829c29d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: I66f0c1b82ef41db9e701ca4e636b03999a6f3194
2021-08-09 21:00:05 +00:00
TreeHugger Robot
623df58e6f
Merge "The wifi dialog text should be Google Sans Text" into sc-dev am: 9000bdc25f
am: a03d9cee0b
am: 918adcbfcc
am: 257e4211b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15472615
Change-Id: I372233ad6f9a89e2d15578b3631797178a23fa40
2021-08-09 20:59:52 +00: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