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
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