PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,155 Commits 1 Branch 0 Tags
2067e288be5301848c689fc4a3702e3ede6440d5
Commit Graph

90155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2067e288be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9a5c27355b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9714f9b77d23e3932f648d53fe56c4886c9ea298
 2021-06-24 20:14:02 +00:00
TreeHugger Robot
9a5c27355b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-24 20:02:43 +00:00
TreeHugger Robot
1137b018f4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-06-24 19:54:30 +00:00
TreeHugger Robot
190323d696 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 6916b17c04 am: c67736416d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I62c4072f7fde29a82bd0f696aa8f37aee55abae5
 2021-06-24 19:13:28 +00:00
TreeHugger Robot
d6ad62f047 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 15e4ca6442 am: e9d4220cfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I112d957fa6683eaac44394820baa07634e0583a2
 2021-06-24 19:12:49 +00:00
TreeHugger Robot
c67736416d Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 6916b17c04 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I439b5978c024cd1a7eed3620725aa4733e94a42c
 2021-06-24 18:48:21 +00:00
TreeHugger Robot
e9d4220cfe Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 15e4ca6442 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ic4ad40ca7669ba1a0890185c18e320f38e7b5ff9
 2021-06-24 18:47:56 +00:00
TreeHugger Robot
fa6415f1d2 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 am: 5c134ad624 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ie9a94e24909310b915f81a889a9ff3e0e48c0e7b
 2021-06-24 18:47:32 +00:00
TreeHugger Robot
15e4ca6442 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Ica9979965368a4aa9c42931441729290b6bd174b
 2021-06-24 18:32:57 +00:00
TreeHugger Robot
5c134ad624 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: I2a8343d2c07d916eb12c83dbe8bd6efa2f00df12
 2021-06-24 18:32:06 +00:00
TreeHugger Robot
6916b17c04 Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859

Change-Id: Id9ccc2ce6ca576f3949b1519019842201a2862de
 2021-06-24 18:30:59 +00:00
Curtis Belmonte
2fb8f498ff Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: e3c31297b2 am: a64d135498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I75898b04c1414c791c0c2a2d6655c58e1a895451
 2021-06-24 18:22:07 +00:00
Curtis Belmonte
1c90fdd2ce Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: 911fc6569b am: cc2b22c85d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: Ia321471296ec4db5bd6f13b7b17ecbde4c616445
 2021-06-24 18:21:45 +00:00
TreeHugger Robot
dda37a3500 Merge "Updated fingerprint bad calibration string" into sc-dev 2021-06-24 18:12:11 +00:00
Curtis Belmonte
a64d135498 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: e3c31297b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I5834c4c4bb2d555cedb6cad78731c011fb82b475
 2021-06-24 18:08:18 +00:00
Curtis Belmonte
cc2b22c85d Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: 911fc6569b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I623be69d55c75db51c6f5f5021facc954b2d80d3
 2021-06-24 18:07:59 +00:00
Curtis Belmonte
18e4a4b040 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 am: af954c7351 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I4b94541df38351e22c8517d3d57b77e9b1610f05
 2021-06-24 18:07:38 +00:00
Curtis Belmonte
911fc6569b Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I8dbc2baf032d6d4dc7af46a80775d33fb7572928
 2021-06-24 17:59:01 +00:00
Curtis Belmonte
af954c7351 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: If8d3f4f71691384312efbbb032f776a123feb307
 2021-06-24 17:59:00 +00:00
Curtis Belmonte
e3c31297b2 Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I915e1b3e6623a30fb3fd9be75bccdb5c13c359a9
 2021-06-24 17:58:07 +00:00
Curtis Belmonte
4de89a9361 Merge "Use correct string for Face Unlock preference category" into sc-dev 2021-06-24 17:47:14 +00:00
Quang Luong
c88fdc144d Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: c017fdda03 am: be9ca3b1cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: Ia7868daa96f9cb6298ebe11f4f701b7f78f2fa57
 2021-06-24 15:50:51 +00:00
Quang Luong
8b3cf19759 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: f151a04d43 am: 06ee380015 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: Ib2dd23ef4dc71a2680a5c8c6a19e5516a620b303
 2021-06-24 15:50:14 +00:00
Bill Yi
528c9aa1a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f83e0ea5eb8bbfc59c1bd4c63ac9acca9a23588
 2021-06-24 15:43:10 +00:00
Quang Luong
be9ca3b1cb Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: c017fdda03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I927165a8c3edd1069bfbd0b0358e89db3e70cc8c
 2021-06-24 15:37:51 +00:00
Quang Luong
06ee380015 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: f151a04d43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I4062970e264d439c01c3d9d741080e127b999689
 2021-06-24 15:37:37 +00:00
Quang Luong
e93e8fe2d5 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: 5f5068f6df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I6f654bda50a93deed9dcb4fa6b61f87dd8e296f3
 2021-06-24 15:37:17 +00:00
Quang Luong
f151a04d43 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: Ibe201c94dadde5ac0498246a3d48d501a720e0b4
 2021-06-24 15:27:38 +00:00
Jeff Sharkey
7ba49c3b02 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: cf5988db8a am: dc8d4365bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: Icebcf5c0d9155ce76bef0201496ad60abc09c612
 2021-06-24 15:27:07 +00:00
Quang Luong
5f5068f6df Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: Ia04e46f443afce296bd76ffa85da4bd0647390d2
 2021-06-24 15:27:02 +00:00
Jeff Sharkey
eeadb807e5 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 60256a980e am: 9bec21269c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I233cd9e37ae278aee50d70a9175d2ac5409b4fa3
 2021-06-24 15:26:55 +00:00
Quang Luong
c017fdda03 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I6d99ce94d10c99294cfd001fe4454e52314bf14b
 2021-06-24 15:26:37 +00:00
Jeff Sharkey
6a9a1b9e91 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 74446ce412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I12ebf9bd8a635fb36207979dfc39c05aa34f2e4b
 2021-06-24 15:17:59 +00:00
Jeff Sharkey
dc8d4365bd Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: cf5988db8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: Id2ee091941fa6d8b35f6cb3352c216b420f24780
 2021-06-24 15:17:32 +00:00
Bill Yi
9ade421c94 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icd1a1e0004c3448bac3883d659e46ad1e08861fa
 2021-06-24 15:17:05 +00:00
Jeff Sharkey
9bec21269c Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 60256a980e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I6ba4da0dde8ada95b42fdbfb7f5c465eff85e533
 2021-06-24 15:13:28 +00:00
Quang Luong
afc0bd763c Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev 2021-06-24 15:12:38 +00:00
Jeff Sharkey
cf5988db8a Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: Ia670fbf2a906638019087cddda098d8c5a40e33b
 2021-06-24 15:02:11 +00:00
Jeff Sharkey
74446ce412 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: Ib9248964e06dc6754a1ad347f04757a04d4bbe19
 2021-06-24 15:01:59 +00:00
Jeff Sharkey
60256a980e Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I450a317c3a77c920f2a633f2f6f9cbd1e226f044
 2021-06-24 15:01:10 +00:00
Jeff Sharkey
5b7518fdf7 Merge "Update to modern Bluetooth permissions." into sc-dev 2021-06-24 14:44:28 +00:00
Wesley Wang
c9faabdb33 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 am: 01be9a9316 am: df795b881e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: I30e15464036a4bd9183efd8709954d6434ceaf24
 2021-06-24 14:17:45 +00:00
Wesley Wang
1ba5265f4c Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 am: faa0004d16 am: cb04d2e23a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: I156fd49f5175c8c0949e24e7ab113591f8f1ae06
 2021-06-24 14:17:07 +00:00
Wesley Wang
df795b881e Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 am: 01be9a9316 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: Ie03cedf951693e5ce90517904ec47e365f26ebea
 2021-06-24 14:07:45 +00:00
Wesley Wang
cb04d2e23a Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 am: faa0004d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: I7ce0388167a6331c78ad49145fbbdb926ea8828e
 2021-06-24 14:07:16 +00:00
Wesley Wang
e148da5df7 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 am: 8750191782 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: I724d6157113468efaa1e08590a6de5a779a16563
 2021-06-24 14:06:50 +00:00
Wesley Wang
faa0004d16 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: Ifb2252f56faaa9f04a6fef2095fed8021272e115
 2021-06-24 13:57:54 +00:00
Wesley Wang
8750191782 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: Ia1cc369b22cdc90d55a00e405d923e45b94d95d3
 2021-06-24 13:56:49 +00:00
Wesley Wang
01be9a9316 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: I18095a162e3422305b3cca2c0a5cd15e7ff4b6f1
 2021-06-24 13:56:45 +00:00
TreeHugger Robot
1629e684aa Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47 am: 3f2fd2e060 am: cbc2f0cb06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023

Change-Id: Ia35782ab41d09b267c193e6b56a803409e62a28d
 2021-06-24 13:51:14 +00:00