Commit Graph

85333 Commits

Author SHA1 Message Date
Peiyong Lin
83a71ca8fd Add Game settings support.
Add Game settings page under Apps so that users can access game related
features and toggle settings.

Bug: b/185822999
Test: make ROBOTEST_FILTER=GameSettingsPreferenceControllerTest RunSettingsRoboTests
Change-Id: I923ba70536b7f68b5330a508b8dabf27e33f4c55
2021-05-18 17:24:51 +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
YUKAI HUNG
bf06c3c5f0 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev am: 80f2f43d59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14609994

Change-Id: I56c5dbb6a03ea06afd292e56d84914ffa9b27150
2021-05-18 15:45:24 +00:00
TreeHugger Robot
3ea9148b47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours am: 1aed128b64 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b9067a4878f6b3c48f16653562bd3e48039270b
2021-05-18 15:45:18 +00:00
YUKAI HUNG
80f2f43d59 Merge "Align system time 12-24 hour format in the time slot information" into sc-dev 2021-05-18 15:41:16 +00:00
TreeHugger Robot
1aed128b64 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7659a826c3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I693505d6b5e10e7b061d42073280dec33dafbdea
2021-05-18 15:29:22 +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
Bill Yi
e8d6f07126 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours am: 0ee82f4c33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie1f2a8e5541098500f9acfb361427dfdef36dbad
2021-05-18 15:12:49 +00:00
TreeHugger Robot
f68e687f10 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours am: 6ac3c7186a -s ours
am skip reason: subject contains skip directive

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

Change-Id: If726240272002e2508990d412cf636686c72d9ed
2021-05-18 15:12:45 +00:00
Bill Yi
5bf187ec27 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours am: 712b1d5b4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c99a25495d69681b25ae52f1a3d48508bb3e636
2021-05-18 15:12:22 +00:00
TreeHugger Robot
7659a826c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-05-18 15:09:42 +00:00
TreeHugger Robot
82ef0b4f14 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-18 15:04:13 +00:00
Bill Yi
0ee82f4c33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9afa4248cc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id52006206bc4bb7c559e8f32217d6e37fe29c657
2021-05-18 14:57:02 +00:00
TreeHugger Robot
6ac3c7186a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 6ab5e4327c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02beb2105366dc036644655914ca838efd839172
2021-05-18 14:56:28 +00:00
Bill Yi
712b1d5b4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cecd68c0c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab9767edf8ee20f7b69ad87e786d04177895c7e4
2021-05-18 14:56:20 +00:00
TreeHugger Robot
4e82b1ee17 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-18 14:52:13 +00:00
TreeHugger Robot
6ab5e4327c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-05-18 14:43:32 +00:00
TreeHugger Robot
f075886ddf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0af7445e78 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icfcd049d3ada04dd6781814faa0c6eccd25f70f5
2021-05-18 14:41:26 +00:00
TreeHugger Robot
a82ce0e247 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 583c25da1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cccf3b1c6212548bffbd6f6960292f4547db3fe
2021-05-18 14:41:10 +00:00
arangelov
d79ab00524 Update ActionDisabledByAdminDialogHelper
- For managed devices, "Learn more" takes the user to a support
page
- Put back the "If you have questions, contact your IT admin"
dialog content text
- Update header to 'Blocked by your IT admin' for managed devices

Fixes: 184107103
Test: manual
Test: atest ActionDisabledByAdminDialogHelperTest
Test: atest ActionDisabledLearnMoreButtonLauncherImplTest
Change-Id: Ie5b8a21b9ba295435d5709f9b0374035141d319a
2021-05-18 15:40:46 +01:00
TreeHugger Robot
0af7445e78 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-18 14:36:27 +00:00
TreeHugger Robot
583c25da1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-18 14:32:55 +00:00
ykhung
1ea5208fa8 Align system time 12-24 hour format in the time slot information
align the time format configuration in the Settings -> System ->
Date/Time to show 12- or 24- hour format in the usage time slot

screenshot: https://screenshot.googleplex.com/3w2SFvBLpC5oHBs
screenshot: https://screenshot.googleplex.com/86uCq6R4PKEg9RD
screenshot: https://screenshot.googleplex.com/3easrEFMQdZEjGP
screenshot: https://screenshot.googleplex.com/7dPWVJNTbSShFPa

Bug: 187783891
Test: make SettingsRoboTests
Change-Id: I9af0a69bd7c67562526bd5ee74a657635068ef44
2021-05-18 13:46:43 +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
Betty Chang
e6fb585031 Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev am: d3cbec6488 am: d76d734a91 am: 2663e3073a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493684

Change-Id: I063f6eaf330a02f61168085f61c247e0df910067
2021-05-18 12:46:23 +00:00
TreeHugger Robot
7abb007847 Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb am: 3509ae87e4 am: f042835757
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218

Change-Id: I69f332396eaaf5ed0e58776fc7f49ac34671f474
2021-05-18 12:46:18 +00:00
YUKAI HUNG
a1b9646619 Merge "Should not show internal package entry in the usage list" into sc-dev am: 0d00ace0d2 am: 25ec1568ab am: 0374df764a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511219

Change-Id: I61a0fa3c0ed86292deeca0f8e510ac93691d3f4c
2021-05-18 12:46:13 +00:00
Kevin Han
2272356b6d Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev am: 421c4e3efc am: db595f288e am: 8c32458b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471254

Change-Id: Ia0cb65a3a060b1ad3b45c8f7647e5f97e5f12ca4
2021-05-18 12:46:07 +00:00
YUKAI HUNG
b381fd2b22 Merge "Remove unnecessary converting us to ms" into sc-dev am: 899845b1ee am: b239ded129 am: e19967797b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503323

Change-Id: Id08b53bd59e3b20659f5ba7a98591a6f609c57be
2021-05-18 12:46:02 +00:00
TreeHugger Robot
741b0ed071 Merge "Add tests for guest user events" into sc-dev am: abd44a8a2e am: 20b1faef62 am: 36f714cbaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491474

Change-Id: I02b5e352e424d22ba44ff14ee298630ea1482576
2021-05-18 12:45:56 +00:00
TreeHugger Robot
09f891452b Merge "Fix color contrast problem for VPN page" into sc-dev am: bc4f3817da am: 32bc62503c am: 8d4c4dc514
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14468618

Change-Id: I31b2ec5b1e42977e6a866e3452c1c4d08e98e0c7
2021-05-18 12:45:50 +00:00
ykhung
90569d5411 Keep selected time slot and expand state when device is rotate am: 9ef9e1ee0c am: 503d21a786 am: dd35264f21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503317

Change-Id: I9176d2141cde0b50d619723d68fbf97778b9eeb4
2021-05-18 12:45:44 +00:00
TreeHugger Robot
db3182ce29 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5 am: 92bf5c4876 am: a6ff8a73c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884

Change-Id: Ie306125e228265b8f70781d8100c8c9f7ca921f7
2021-05-18 12:38:28 +00:00
TreeHugger Robot
90a25734ee Merge "Disable the info icon" into sc-dev am: 0fa1e491f8 am: 54d5defb28 am: e77b5a8f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493678

Change-Id: If5d96ba8eec7fe19ee2fb14a631245761dfd6e58
2021-05-18 12:38:16 +00:00
PETER LIANG
0ee03de1aa Merge "Provide a way to Accessibility button settings via intent." into sc-dev am: f2d70ab320 am: 9c8507fe11 am: 4077915d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008225

Change-Id: I5eb1eb073c26ac54144c4896ad7413151ba7a056
2021-05-18 12:35:17 +00:00
Menghan Li
4374a94f7d Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1 am: 6476b523ef am: b984a552b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: Id025cac2f241c6f7098445520d7e19c20436f3d0
2021-05-18 12:34:46 +00:00