Commit Graph

84522 Commits

Author SHA1 Message Date
TreeHugger Robot
d21bcdaaa0 Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev am: c3dfd37df6 am: fee3049603 am: c847bf6b08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540524

Change-Id: Ic191dfe9c784e889c60ed81feafa0e2b5e8a3e64
2021-05-18 18:32:59 +00:00
TreeHugger Robot
56c84ee6ad Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev am: e01099b245 am: 22f1137335 am: 9f2ac978a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515939

Change-Id: I925c6a7887bdaa7bd98e249db9dd2aa50b3b78b8
2021-05-18 18:32:53 +00:00
Yanting Yang
b4cf27cee4 Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e am: 1e14321bfe am: 7a4588d348
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526

Change-Id: I85125e6f133fe72d878d7c550bbc017148466eed
2021-05-18 18:32:41 +00:00
YUKAI HUNG
3acf017a70 Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: f70cb82b0c am: 185c38f26c am: 9b31388f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515927

Change-Id: I6d2e333d02c239e0487d004f9e13967a5140329d
2021-05-18 18:21:47 +00:00
Tiffany Nguyen
e939d670bb Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f am: 77728801c2 am: e3a46ae42a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486116

Change-Id: If7bbd82ae297cf4acd395807c6578f4fb6b56b5e
2021-05-18 18:21:40 +00:00
Kevin Chyn
d5e870fd92 Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801 am: 29366ad429 am: 0060445136
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459

Change-Id: I3d2bde6253a25baf32a6926e8c4ab595f206320b
2021-05-18 18:21:33 +00:00
Julia Reynolds
42ba688e27 Merge "Fix vertical alignment in history" into sc-dev am: 14f204af54 am: 494d01bd76 am: cca752b350
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14532408

Change-Id: Ifc24ef2710fe00842441953dd321ca98f055abd2
2021-05-18 18:21:26 +00:00
Julia Reynolds
c9fbf42562 Use | not , am: 78c4e70cf6 am: eeb455e63a am: 62cf042047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: I23e816138103642785dcb2221ccf5443767136a1
2021-05-18 17:38:14 +00:00
Bill Yi
d12b7dd0b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b -s ours am: 5ab07c89a2 -s ours am: 3d867d50f5 -s ours am: c092945258 -s ours am: ab131311c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7ca966c387a7502f861e9fbc070dbba3f097f459
2021-05-18 17:37:00 +00:00
Bill Yi
fccead18b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 933340766b -s ours am: 64e44f83b9 -s ours am: df3c661db7 -s ours am: 1f3e91e040 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I668ed6eba498f6267fd3efecd479690add7cab6f
2021-05-18 17:36:54 +00:00
TreeHugger Robot
b757649a5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4cb355f8e5 -s ours am: 5d8ba6d5cd -s ours am: 80a863b4ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4237797fac22c866ec049654afa9fe2c919dc920
2021-05-18 17:36:26 +00:00
Jernej Virag
8db13e7844 Merge "Fix power+volume chord fallback when LPP option is disabled" into sc-dev am: 1f1cb3a7a8 am: 1182325088 am: d6a69392a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500675

Change-Id: I966acba4756248673a9703e32885de49fbe9ed43
2021-05-18 17:36:21 +00:00
TreeHugger Robot
a1d4ebad80 Merge "Fix talkback label "ACCOUNTS FOR OWNER" is not matching problem" into sc-dev am: 157a83a6f2 am: 01b674b65c am: 3865d52d52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519524

Change-Id: Ie39d4ff1932d35a8c3e8548c39da08d0f7a9ac40
2021-05-18 17:36:14 +00:00
TreeHugger Robot
d338f6c241 Merge "Notif Settings polish" into sc-dev am: f6b42231e0 am: 4d3253fa0a am: 1cf9e270ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14517130

Change-Id: I3d1a944a86f075fdacb833cef6cb456e8cf4f682
2021-05-18 17:36:07 +00:00
Jeremy Goldman
cf367c70fe Merge "Store whether the Dialog was previously dismissed" into sc-dev am: 0c28e9dca7 am: d4cdc13ecd am: 8fbd14489b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518466

Change-Id: Id0cbbdedad02c01865a41797e4b879fbd34d934a
2021-05-18 17:36:01 +00:00
Wesley Wang
c9a274c233 Merge "Update restriciton page to support legacy string" into sc-dev am: b769cf8067 am: 114ab709a2 am: f7c99cff32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514137

Change-Id: Iecac3094cbd6a3f8ef92808af8461b29f56fb7fe
2021-05-18 17:35:54 +00:00
YUKAI HUNG
9b4a09ef4b Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: e69e95fed1 am: e6e913cb4d am: a4a1e78445
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518469

Change-Id: Id862a52c83d42d0c2fe88c424e48ed3766822b0c
2021-05-18 17:35:48 +00:00
Arc Wang
531f4d84a0 Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev am: 3a77c9c9e4 am: dddedfec43 am: 7f73bc3748
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514140

Change-Id: Ib2abfa2b3aec622bd3886cdd75dfc34ab1d48ddf
2021-05-18 17:35:41 +00:00
Kevin Han
2eeefe5872 Merge "Add tests for HibernatedAppsPreferenceControllerTest" into sc-dev am: 9351dde1e5 am: bc2f8699df am: ffbe9b97b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506400

Change-Id: I8185516538bc3be981359722f2cfcb5f1c109fe9
2021-05-18 17:35:34 +00:00
TreeHugger Robot
733ba91138 [automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-qpr-dev am: 8b37f0a2cf am: f880a8bdf2 -s ours am: 635627a071 am: c1056881e9 am: 1078966194 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13706bb1852b0cb962693b2872d0fcc38c969caf
2021-05-18 17:35:28 +00:00
Weng Su
ed6cb9222a [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628 am: 1599278d12 -s ours am: 54b155bd81 am: f9160ce57f am: 0f88115c3a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9787cbdca3db7fbe6129e0c8e7f31a7ee4728d78
2021-05-18 17:35:27 +00:00
TreeHugger Robot
4c19b7ebbc Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a am: aa63f727d7 am: 879f4472ec am: 0d44dd5a0d am: dd7d5bbc96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: I17f5f9273bf1382c8f998ba831cc7a3ea7eac684
2021-05-18 17:35:20 +00:00
Hugh Chen
f6321ec695 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807 am: 7b3da742d1 -s ours am: b548aa378d am: 7e9405edc9 am: f2ddf4bfab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f4d6b3b84525ba7b8f3cd82231952fbb7bf7786
2021-05-18 17:35:19 +00:00
Yanting Yang
651576580e Merge "Update homepage summaries for Display and Security" into sc-dev am: 9c3424449e am: 7b61ed248c am: a5d03f662e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501878

Change-Id: I4276f119f993b0712819b73148cb4370f24fe412
2021-05-18 17:35:09 +00:00
Ryan Lin
0c1e2c71ba Merge "Fix incorrect layout in RTL" into sc-dev am: a2f47b3299 am: a8920e8cae am: 8f41a70d54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514126

Change-Id: I511eabfc5fa796541fb2a878659b59472e4b457e
2021-05-18 17:35:01 +00:00
Curtis Belmonte
47eb328ee9 Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626 am: f88242c07c am: 9331f6d774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896

Change-Id: Ia259bb1e140545020d2738c9acbaaef85580aa71
2021-05-18 17:34:52 +00:00
Jason Chiu
19f46f20c3 Merge "Redesign homepage IA icon" into sc-dev am: cb88a7e24d am: de90a36450 am: f1be36eeec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187779

Change-Id: Ia49048de7c462069cfe9a6082d811da6e188c227
2021-05-18 17:34:23 +00:00
TreeHugger Robot
fcf2255371 Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52 am: 809335aaa6 am: 8fe97b906e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955

Change-Id: Idd68b7246562b479312a215717c04478d34c75c1
2021-05-18 17:34:16 +00:00
Jakub Pawlowski
a2d5f3e0b1 [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: 0470fbade0 -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: I5c965ead2a1a1438511e237541687f7b6c573da8
2021-05-18 17:34:10 +00:00
Jakub Pawlowski
4f8896196f Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 am: 355dcf3757 am: 9e52c1621b am: 6949e55ce1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I7e48e1c16cf16736d2562dddcddc3af4c230a6fd
2021-05-18 17:33:52 +00:00
Jakub Pawlowski
10bbc1879d [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: d2bc02746e -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: Idc7633514f21e5153dba0dab3aa47feed0c979de
2021-05-18 17:33:42 +00:00
Jakub Pawlowski
fe3a9d184d Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0 am: b96d8078b7 am: c7621e5c88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

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

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

Change-Id: I4ba344b5b401563a7d61dcc62abdf9af4dc350eb
2021-05-18 17:11:36 +00:00
Lucas Lin
cb56181fc3 [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: 0fa0429eb2 -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: Ia1a2a8d44c1e43d71bebf0bd413020022da7185f
2021-05-18 15:22:49 +00:00
TreeHugger Robot
82ef0b4f14 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-18 15:04:13 +00:00
TreeHugger Robot
4e82b1ee17 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-18 14:52:13 +00:00
Kevin Chyn
177825203b Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11 am: cd9ea26bbe am: 304d0c6c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399

Change-Id: Id103248bd16f153edbdf78465792773ad8976e4f
2021-05-18 12:47:35 +00:00
Simon Wingrove
1e84653129 Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e am: 1cc723877c am: 748d1d1cea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179

Change-Id: Iab4d6548772eaddc38928bc22c1fc14885d46b42
2021-05-18 12:47:30 +00:00
YUKAI HUNG
1cc3d2b8fe Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4 am: 3c56056709 am: 09a87e1530
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139

Change-Id: I05b19e675c99a157049f2ee5c9908d8807fd2943
2021-05-18 12:47:24 +00:00
TreeHugger Robot
3a137693dc Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev am: 839207436b am: 30a1d20c84 am: 0bfadc10d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14489518

Change-Id: I6b2c8164d920c712e1b6392432d87c48eea76544
2021-05-18 12:47:19 +00:00
Wesley Wang
c75cddf480 Merge "Update battery charging status string" into sc-dev am: 0f8673407a am: 0f693af408 am: 0a5b46b87c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514133

Change-Id: Ic69613e57e4b6dc289fb35aa94af2846fbcaea02
2021-05-18 12:47:13 +00:00
TreeHugger Robot
afd7be5d4d Merge "Fix NPE on guest user" into sc-dev am: 1f9e88377c am: 5e1febaf38 am: 37bcbac813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14505816

Change-Id: Id3fc03e09a444ecf69c59a5a218728c8fac6e414
2021-05-18 12:47:08 +00:00
TreeHugger Robot
f94466b727 Merge "Don't show DND access settings in managed users" into sc-dev am: 4784df542d am: 2b431505d9 am: e052b98f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470058

Change-Id: Id97a72a37f5fa487ea2991837c755c8b952b498a
2021-05-18 12:47:02 +00:00
Wesley Wang
741071e8c8 Merge "Update battery state string" into sc-dev am: e966debfd5 am: ac62a0a172 am: 0c60387b00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495886

Change-Id: Ia78bb6321da72057ef0465bbbf11f2b6fd2169d8
2021-05-18 12:46:56 +00:00
Betty Chang
d72f80b91b Merge "[GAR] Change the text color for "Airplane mode is on" message to follow the GAR" into sc-dev am: 8081c1fbdc am: bc3f743d58 am: d60c4f44cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501879

Change-Id: I141fa2aa8bc0f3cc824935d34f599f84bddca0a2
2021-05-18 12:46:51 +00:00
YUKAI HUNG
e38fce2adc Merge "Clear static icon and label cache if ui mode is changed" into sc-dev am: d78cd7272d am: becb4874d0 am: 4c366be30c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514123

Change-Id: I2444900a452bfeb9943d327c05d21e983f7f832a
2021-05-18 12:46:46 +00:00
Menghan Li
a2d39994c2 Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev am: fd05966f4f am: e2fd5336fa am: ab21467a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493677

Change-Id: Ie7fc71db28948e2da433c86a19392cb949a290da
2021-05-18 12:46:40 +00:00
Menghan Li
07b8f57ea3 Merge "[Material Next] Support "Learn more" for help link" into sc-dev am: 7bdf791e6c am: 5d16f0016e am: a8a43a11d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486196

Change-Id: I3727ea4ac8adc9fe7b7fed40dfa94444337e92c5
2021-05-18 12:46:35 +00:00
TreeHugger Robot
3559623fb9 [automerger skipped] Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035 am: c2937740e6 am: 01393e73f4 -s ours
am skip reason: Merged-In I8361c29bc240c519c7261b19522c41439479c1c2 with SHA-1 543068210f is already in history

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

Change-Id: Ibb4daa95477a76c3f863e099ec17d7e932191b46
2021-05-18 12:46:29 +00:00