Hugh Chen
7b3da742d1
RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316
Change-Id: Iab901770b71e25819117d5cc4a84813f083e0511
2021-05-13 04:46:14 +00:00
Ryan Lin
3f50bb66f5
Merge "Fix incorrect layout in RTL" into sc-dev am: a2f47b3299
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514126
Change-Id: I317f96c0280826d1034a1e82943d121beb7d1de2
2021-05-13 04:30:52 +00:00
TreeHugger Robot
8b37f0a2cf
Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev
2021-05-13 04:30:42 +00:00
Curtis Belmonte
5129a027ff
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: I92038bfdfe5153386b909ba34cff99a71a1636b0
2021-05-13 04:30:41 +00:00
Ryan Lin
a2f47b3299
Merge "Fix incorrect layout in RTL" into sc-dev
2021-05-13 04:27:18 +00:00
Curtis Belmonte
5ed928f626
Merge "Consolidate face enroll intro/consent screens" into sc-dev
2021-05-13 04:01:56 +00:00
Yanting Yang
b2eb2bbc28
Update homepage summaries for Display and Security
...
Also clear the redundant strings and tests.
Bug: 183586663
Test: robotests & visual
Change-Id: Iff149ac566c4b42d89810fe389ad4f723765b6b5
2021-05-13 11:55:48 +08:00
Jason Chiu
f20a2ad12c
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: Ieb9e9d9ec57ecc126d13c062f5ff206b408f7823
2021-05-13 03:21:14 +00:00
Jason Chiu
cb88a7e24d
Merge "Redesign homepage IA icon" into sc-dev
2021-05-13 02:59:29 +00:00
Tiffany Nguyen
5924161061
Redirect battery-level settings preference clicks if needed
...
Change-Id: I64d0992544cc7e0cb41293b799577cbc43dfbb38
Bug: 181827923
Test: unit
2021-05-13 02:55:03 +00:00
TreeHugger Robot
40fa6928df
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: Ic98761f810155dcfe68e5e1b250becf65c08c428
2021-05-13 02:43:17 +00:00
TreeHugger Robot
e5052a7b52
Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev
2021-05-13 02:09:57 +00:00
TreeHugger Robot
d8cacc526a
Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev
...
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
2021-05-13 01:33:00 +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
d73c158986
[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: I72ddf9ed90c4a39e0584d1d101b12e02e7cacabf
2021-05-12 21:34:56 +00:00
Jakub Pawlowski
8831f3a905
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: I912f2eed4e254b9af11ff4045cbd37167558b031
2021-05-12 21:34:35 +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
8a672bacfd
[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: Icf3760a6101d77ed2076d6f9a320c784fa97487c
2021-05-12 21:27:05 +00:00
Jakub Pawlowski
091fa86790
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: I78e95ce42dde95361971f937bdab763a9292b82a
2021-05-12 21:26:57 +00:00
Abel Tesfaye
5c93b1df44
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: Ibdd8876cfb18ce275288ed3df984ab5902b4473b
2021-05-12 21:26:41 +00:00
Abel Tesfaye
08737147fb
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: I5f48ffb64e83a4307a1954ae5b13b9d4bd9e4566
2021-05-12 21:26:40 +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
Kevin Han
25ed73fa51
Add tests for HibernatedAppsPreferenceControllerTest
...
Add tests for getNumHibernated in HibernatedAppsPreferenceController
based off the major use cases.
Bug: 187745929
Test: atest HibernatedAppsPreferenceControllerTest
Change-Id: I7bee75075f12fc1661f1b12da82e6ccb16eaa06d
2021-05-12 13:09:09 -07: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
789fd875b3
[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: I6cb4e928d0270b8ae7e9a86b16792386ffead306
2021-05-12 18:49:37 +00:00
Kevin Chyn
7f459bb888
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: I1819d509eb85c7a63fde3ba1c3519f8136d06ce1
2021-05-12 18:48:30 +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
438979693d
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: I8a1e942a795f608bee1f03e809a9e03d4a7e4b35
2021-05-12 17:21:25 +00:00
Lucas Lin
2e7309ffd3
Merge "Use [set|get]PrivateDnsMode directly"
2021-05-12 17:09:50 +00:00