PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,683 Commits 1 Branch 0 Tags
c4226d3a592fe38d57aba8429a214ce44222127d
Commit Graph

84683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
c4226d3a59 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours am: 76a6621428 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied8daaa67a92cfcf08ecae26eeacb9b0863e1d91
 2021-06-24 20:24:23 +00:00
TreeHugger Robot
76a6621428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcd09b7c0a3ab713a23fa91c239e617476f5e67e
 2021-06-24 20:14:06 +00:00
TreeHugger Robot
3fb4a97104 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ca62b8d0aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f69937d7673d2ac4e085bdf4e1609a39a17c5b2
 2021-06-24 20:06:40 +00:00
TreeHugger Robot
e690d1c9ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0708e90f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42202ee3f1cc9bda4992b7db492ef2db750cc245
 2021-06-24 20:06:15 +00:00
TreeHugger Robot
edeef947e4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-24 19:56:59 +00:00
TreeHugger Robot
ca62b8d0aa Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:51:09 +00:00
TreeHugger Robot
f0708e90f6 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-24 19:48:40 +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
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
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
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
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
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
Bill Yi
ae7989d729 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0b8647c8319e2389b3e8bf0bf90edcfc9935d25
 2021-06-24 15:51:28 +00:00
Bill Yi
d1c25e8dfe Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I62eace4a91508f8f27ab37d4cb9a464ba6417f4c
 2021-06-24 15:39:29 +00:00
Bill Yi
a83bc881f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib99ff0cca771e011eb4c7c01e741b47a6ff57724
 2021-06-24 15:37:57 +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
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
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
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
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
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
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
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
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
Wesley Wang
31428e9dc5 Merge "Remove unnecessary converting us to ms" into sc-dev 2021-06-24 13:45:16 +00:00
TreeHugger Robot
cbc2f0cb06 Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47 am: 3f2fd2e060 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023

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

Change-Id: I82708d22cde27cca3d54dfc2a9abf598c5e8ba08
 2021-06-24 13:38:43 +00:00
TreeHugger Robot
e5418e79b3 Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47 am: 025be92f86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023

Change-Id: I460757a94f4fbeaeb9768051459a295f124c3faa
 2021-06-24 13:38:17 +00:00
TreeHugger Robot
025be92f86 Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023

Change-Id: I28cd085bdee109258f09cb0caf7f43a0d7d6fd2b
 2021-06-24 13:37:48 +00:00
TreeHugger Robot
e7b17ece47 Merge "Fix a flicker problem on top app bar" into sc-dev 2021-06-24 13:32:55 +00:00
Alex Johnston
1335e884b3 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d am: 6cbce0e954 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: Id272a6790802a74f2eb7a541e8537abcd8491fb0
 2021-06-24 13:25:12 +00:00
Alex Johnston
2a5ea33e72 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d am: f4bfda65a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: I1d973e8ac46797b47797aaeb6aa76fd2c447b012
 2021-06-24 13:24:54 +00:00
Alex Johnston
f4bfda65a5 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: Ib94bf919bc168523688bad893b8dbc63826f0fe1
 2021-06-24 13:12:33 +00:00
Alex Johnston
6cbce0e954 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: I9711a05481efbc6b4d03d0247e2e753b9efedecc
 2021-06-24 13:11:43 +00:00
Alex Johnston
901617e37d Merge "Update CA certificate warning to material next spec" into sc-dev 2021-06-24 12:59:14 +00:00
Wesley.CW Wang
273a7d96a3 Remove unnecessary converting us to ms 
- Pick from pagit/1951738
 - The class "Estimate" has the menber estimateMillis and the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond, so converting from us to ms is unnecessary.

Bug: 187379252
Bug: 184916537
Test: make RunSettingsRoboTests
Change-Id: I2e8e03451352d7ad4cd44f72d5261dad35a81eb9
 2021-06-24 11:41:53 +00:00
Prochin Wang
7fb2a3e852 Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a am: ab3018bd2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270

Change-Id: I576e4f4b07af208ebb32b612483bb6a6d7cd4c58
 2021-06-24 09:51:32 +00:00
Prochin Wang
4022d5e021 Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a am: 595709c5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270

Change-Id: I104ca3b29cfbfd64f0b66e77366b5686b518e407
 2021-06-24 09:51:12 +00:00
Prochin Wang
595709c5a7 Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270

Change-Id: Ic47d91f747888dfb5a54f8ce773fd5fc5c8f93b2
 2021-06-24 09:35:51 +00:00
Prochin Wang
ab3018bd2c Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270

Change-Id: I2a290afc3256e5ed9ec440f021110aaacaa03031
 2021-06-24 09:34:58 +00:00