Commit Graph

82196 Commits

Author SHA1 Message Date
TreeHugger Robot
8fe97b906e Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52 am: 809335aaa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955

Change-Id: I32c639ec0c79df89c917c3b2f4537eb3a34d9e0d
2021-05-13 02:57:53 +00:00
TreeHugger Robot
809335aaa6 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: I4e9b109d10341d06298903801138ab01d9cd0452
2021-05-13 02:44:35 +00:00
TreeHugger Robot
e5052a7b52 Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev 2021-05-13 02:09:57 +00:00
Jakub Pawlowski
0470fbade0 [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: 5801d2af17 -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: I20c2418e423ccea5830f395e79252d70099348fe
2021-05-12 21:43:10 +00:00
Jakub Pawlowski
6949e55ce1 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 am: 355dcf3757 am: 9e52c1621b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I63123cad53512077d0aba487ea4e9b5677916ea1
2021-05-12 21:43:02 +00:00
Jakub Pawlowski
d2bc02746e [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: d62548790b -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: I007c15edb008ad9f0ee9af51b255a95cd3fddd8d
2021-05-12 21:42:55 +00:00
Jakub Pawlowski
c7621e5c88 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0 am: b96d8078b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

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

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

Change-Id: I38535c7566f7423dec504f97c12c5837056846c1
2021-05-12 21:41:43 +00:00
Jakub Pawlowski
5801d2af17 [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: Ic3dafba46131118e26ed4f210c6ff814015c36ad
2021-05-12 21:29:03 +00:00
Jakub Pawlowski
9e52c1621b 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: Ibd3442cdeb802ff73ab103e5e43b659714813380
2021-05-12 21:28:56 +00:00
Jakub Pawlowski
d62548790b [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: I8d9ceccc42b8ff034c1368c3ea21f9cc05943d74
2021-05-12 21:28:49 +00:00
Jakub Pawlowski
b96d8078b7 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: Ic7b4785bc1504798c4114f5ece519b5bf017fe09
2021-05-12 21:28:41 +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
Abel Tesfaye
bc59298a10 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: I8cd52af6ed5bd2e38f564d103413fdf036278563
2021-05-12 21:28:25 +00:00
Abel Tesfaye
0ce0ea15a7 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: I204e5aa0e861f715024419334ef6db0c5782ef0b
2021-05-12 21:28:23 +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
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
Lucas Lin
0fa0429eb2 [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours am: e5fcc54bfc -s ours am: 209df66539 -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: I4c4b8d4bec9647fbd0948cf440bacb03183cfd12
2021-05-12 20:20:38 +00:00
Kevin Chyn
304d0c6c7b Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11 am: cd9ea26bbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399

Change-Id: I0b6d962f682f7243e454d15bf87a9a9d2e8015d8
2021-05-12 20:20:20 +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
209df66539 [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: Iac9f11c79dd80cb201fde15ca4cb86db1ae07e2e
2021-05-12 18:51:14 +00:00
Kevin Chyn
cd9ea26bbe 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: If67fb1c335bcfd86c7c1e7daee37d1b2332aaf80
2021-05-12 18:49:57 +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
Simon Wingrove
748d1d1cea Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e am: 1cc723877c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179

Change-Id: Ibf8edb64ce50f6a617bcd622431e6bd56be31518
2021-05-12 17:59:21 +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
1cc723877c 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: I585e871debe441fb7af4ebae31cad57792d037ed
2021-05-12 17:23:20 +00:00
YUKAI HUNG
09a87e1530 Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4 am: 3c56056709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139

Change-Id: I99946695f1886c79427f60a02a306aa004b28732
2021-05-12 17:14:09 +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
3c56056709 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: I35a788d50c0677cab2e8db1586ebde87fd645bdc
2021-05-12 17:00:54 +00:00