PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,810 Commits 1 Branch 0 Tags
426fded7ef17a922b2e40aeec49d971b49dcb966
Commit Graph

81810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Curtis Belmonte
426fded7ef Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896

Change-Id: I9bb6bb1d824bdac0bcce82a07420f4f8b0156b69
 2021-05-13 04:31:17 +00:00
Curtis Belmonte
5ed928f626 Merge "Consolidate face enroll intro/consent screens" into sc-dev 2021-05-13 04:01:56 +00:00
Jason Chiu
9ddaf4b7d4 Merge "Redesign homepage IA icon" into sc-dev am: cb88a7e24d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187779

Change-Id: I5e2f2cc846bb58992b7ecbfa5650efec7e2e6868
 2021-05-13 03:21:16 +00:00
Jason Chiu
cb88a7e24d Merge "Redesign homepage IA icon" into sc-dev 2021-05-13 02:59:29 +00:00
TreeHugger Robot
1ebe8025d1 Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955

Change-Id: I8276f5e58ee972bf7ab73f39b807b5a6a5d3ce1c
 2021-05-13 02:42:28 +00:00
TreeHugger Robot
e5052a7b52 Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev 2021-05-13 02:09:57 +00:00
Curtis Belmonte
cef573f2d0 Consolidate face enroll intro/consent screens 
Updates the UI of the face enroll intro screen based on the latest
mocks, while still allowing strings to be overlaid depending on the
device and/or face auth implementation.

Test: Manually tested face enrollment

Bug: 187207438
Change-Id: I5d912261b1eecfc7a241d6b48d549c4ff253ecdf
 2021-05-12 17:26:17 -07:00
Jakub Pawlowski
7d84e30b19 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: aab008b6be -s ours am: 50b308df2e -s ours am: c19ad05b02 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 9d99e0b3ff is already in history

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

Change-Id: I02a123656d5edcc21582c50eb1c57a6c316e2e87
 2021-05-12 21:34:43 +00:00
Jakub Pawlowski
d7364ca738 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 am: 355dcf3757 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ib8c33dd9a23d3f24c6d2f40ec7c3a056acc7fe7c
 2021-05-12 21:34:24 +00:00
Jakub Pawlowski
c19ad05b02 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: aab008b6be -s ours am: 50b308df2e -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 9d99e0b3ff is already in history

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

Change-Id: I277fd8ec00ac06943d9fab6d323b98fc0c8277e4
 2021-05-12 21:28:38 +00:00
Jakub Pawlowski
355dcf3757 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I2767a67fe1992f1e38eb1ad3d2f3f7c900a6098f
 2021-05-12 21:28:15 +00:00
Jakub Pawlowski
cebc80d634 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: 694f25b2c7 -s ours am: b0da292758 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I200b463a5d65a565eb0d3321c02a9bd467878e2c
 2021-05-12 21:26:21 +00:00
Jakub Pawlowski
7623ac8a68 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I2f63786d11a9a1cf5b7d539196d2386dd0f36914
 2021-05-12 21:26:13 +00:00
Abel Tesfaye
3f37a074d4 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367

Change-Id: I62b1b5f692c4429757235dbe5ad4413fe3c33dde
 2021-05-12 21:25:55 +00:00
Abel Tesfaye
766b3d099a Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev am: 43905b3459 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14430041

Change-Id: I2d56896f4073a2922b25509cb8e1b233acb912bd
 2021-05-12 21:25:54 +00:00
Jakub Pawlowski
b0da292758 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: 694f25b2c7 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I8a18f3daaac645a495de33a0e479fa699857c872
 2021-05-12 21:12:17 +00:00
Jakub Pawlowski
bb78247cf0 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I41cb6bd53a787214896c7875104c6b08419b3047
 2021-05-12 21:12:09 +00:00
Jakub Pawlowski
50b308df2e [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours am: aab008b6be -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I5492bdd0db4d3ee60faf96a93ec8011a186b471a
 2021-05-12 21:11:37 +00:00
Jakub Pawlowski
ed9a891fa1 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I4cc43b913f4d2b3a15355bcf0be91b2e63d6a2ed
 2021-05-12 21:11:26 +00:00
Jakub Pawlowski
694f25b2c7 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I5c4bcf5792f7e9a5564444bb5d5c98f473e1b619
 2021-05-12 20:57:33 +00:00
Jakub Pawlowski
72cda9d96c Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ic9497921a93fb77c05f2d396503f0b3764734586
 2021-05-12 20:57:26 +00:00
Jakub Pawlowski
aab008b6be [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours am: 8ae86914d6 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: If34b09d6e20810bb672c0e88ad21d6a8903ddcb8
 2021-05-12 20:55:59 +00:00
Jakub Pawlowski
123cb13df8 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I64eb60c0041ffd2f07b2b879fd2daf082a6b331e
 2021-05-12 20:55:50 +00:00
Jakub Pawlowski
8ae86914d6 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I1cd894a5924c4afc52256d85f9a19da5a2cede22
 2021-05-12 20:36:51 +00:00
Jakub Pawlowski
c714533fd2 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I47b6e2b3de493030adfd49bfeb4aabaf16046771
 2021-05-12 20:36:41 +00:00
Jakub Pawlowski
31c29a0791 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I145082eccf613bb5729b67a7f58a34f3c913184e
 2021-05-12 20:19:24 +00:00
Jakub Pawlowski
52ea712e3b Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ied144c16d607921281d10783a77ae0d46885d757
 2021-05-12 20:19:16 +00:00
Jakub Pawlowski
8797825bc1 [automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours 
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history

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

Change-Id: I65f86808c2d2455c98c022ad52680597c58ff148
 2021-05-12 20:04:53 +00:00
Jakub Pawlowski
d6ed1528cb Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882

Change-Id: Iddc0d74ef10d404f8463544683cc913656346a34
 2021-05-12 19:47:21 +00:00
Guojing Yuan
19235b8bba Fix task affinity for NotificationAccessConfirmationActivity 
Fix: 186029669

Test: manual
Change-Id: I366d4d6502d6d89b3d9d53d9190f376f678bccc1
 2021-05-12 19:37:44 +00:00
Abel Tesfaye
989570a9b6 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev 2021-05-12 19:27:51 +00:00
Abel Tesfaye
43905b3459 Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev 2021-05-12 19:27:51 +00:00
Jakub Pawlowski
9d99e0b3ff Prevent drawing on top of DevicePickerActivity 
Bug: 182584940
Merged-In: I8b27b397bce1708a42b96b1b647c64e23142c468
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
 2021-05-12 19:27:32 +00:00
Jakub Pawlowski
3a2ab54f36 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev 2021-05-12 19:27:19 +00:00
Lucas Lin
eb65d2eede [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours am: e5fcc54bfc -s ours 
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709 is already in history

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

Change-Id: I234ea6e285e237f51d14b25ca686b819681b9f9b
 2021-05-12 18:48:47 +00:00
Kevin Chyn
1de4861f75 Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399

Change-Id: I907d6b7d15df9e074f2092293265da2bde10e971
 2021-05-12 18:48:21 +00:00
Lucas Lin
e5fcc54bfc [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours 
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709 is already in history

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

Change-Id: I0d449ede5a55718480c284a4da6b84336049e19f
 2021-05-12 18:24:14 +00:00
Lucas Lin
b6e2b4239c Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I460d308ab370a662b63a43c7e027e355c7d36130
 2021-05-12 17:59:57 +00:00
Kevin Chyn
cbf7e63d11 Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev 2021-05-12 17:44:11 +00:00
Lucas Lin
aa307b03a9 Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I18cd6578c4cec746aa1cfaba60822d857fab9b8d
 2021-05-12 17:23:45 +00:00
Simon Wingrove
6b741c5a88 Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179

Change-Id: Id8d6cfe0654c88dc3f8276d2d8fe56352783703d
 2021-05-12 17:21:57 +00:00
Lucas Lin
2e7309ffd3 Merge "Use [set|get]PrivateDnsMode directly" 2021-05-12 17:09:50 +00:00
Simon Wingrove
47b5eadc5e Merge "Allow security controllers to be used in other fragments." into sc-dev 2021-05-12 17:07:08 +00:00
YUKAI HUNG
a3f81730fb Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139

Change-Id: I76d63f899b74f158ac84ce93c731f9d3f6adc04f
 2021-05-12 16:56:52 +00:00
YUKAI HUNG
0d765c45a4 Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev 2021-05-12 16:46:38 +00:00
TreeHugger Robot
ab1088f14d Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev am: 839207436b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14489518

Change-Id: I9b6ba81b9fbc37aa69330764f63c589d995047da
 2021-05-12 16:05:44 +00:00
TreeHugger Robot
839207436b Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev 2021-05-12 15:51:37 +00:00
ykhung
2102059e2d Fix GAR issue for battery chart description and the contrast ratio 
Bug: 187813918
Bug: 187811403
Test: make SettingsRoboTests
Change-Id: I4fae623a305fd1ee022336bcae35d9dd9995146d
 2021-05-12 15:38:33 +00:00
Wesley Wang
10b2fb5ea5 Merge "Update battery charging status string" into sc-dev am: 0f8673407a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514133

Change-Id: I7f6f23771dbcc84bebdd3a1216bbd4d8e0a9bc6f
 2021-05-12 15:17:00 +00:00
Wesley Wang
0f8673407a Merge "Update battery charging status string" into sc-dev 2021-05-12 14:57:30 +00:00