Commit Graph

85210 Commits

Author SHA1 Message Date
Kevin Chyn
beb5a10043 Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801 am: ecef0cd069
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459

Change-Id: I14aef39f5b12ab671e29c9d51eb7b36d53ce650d
2021-05-20 01:47:08 +00:00
Julia Reynolds
3b9579dc4d Merge "Fix vertical alignment in history" into sc-dev am: 14f204af54 am: b1d00f88f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14532408

Change-Id: Iea8189a7f6b8fe13859afe92769afa227c2151af
2021-05-20 01:47:02 +00:00
Julia Reynolds
8bc9539a40 Use | not , am: 78c4e70cf6 am: afb60352f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046

Change-Id: Ibd92d987dcea51d5447c78628bac068bfa052b52
2021-05-20 01:46:55 +00:00
Bill Yi
71fd91ee53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b -s ours am: 5ab07c89a2 -s ours am: 3d867d50f5 -s ours am: 70256e36a0 -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: I67ae32540e337f7b020be6b8d111363ea8df0d80
2021-05-20 01:46:39 +00:00
Bill Yi
420d1269e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 933340766b -s ours am: 64e44f83b9 -s ours am: e8fbeaa41c -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: Ie7bce4444c2fe647e396b91ee7365e0644246829
2021-05-20 01:46:33 +00:00
TreeHugger Robot
b5f00d5dfe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4cb355f8e5 -s ours am: 6313baa330 -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: I6c69aec8e6a5ba985c98563b46793ea6b1676fb0
2021-05-20 01:42:58 +00:00
Jernej Virag
7f0c34575c Merge "Fix power+volume chord fallback when LPP option is disabled" into sc-dev am: 1f1cb3a7a8 am: c1a2c5beb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14500675

Change-Id: Iadc626003f3bed898d1e87854a6486a00bd1b734
2021-05-20 01:42:53 +00:00
TreeHugger Robot
47b02f3fda Merge "Fix talkback label "ACCOUNTS FOR OWNER" is not matching problem" into sc-dev am: 157a83a6f2 am: eef8dfc840
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519524

Change-Id: Ie2d7957b212fced738394376154a165befee690a
2021-05-20 01:42:47 +00:00
TreeHugger Robot
9632188750 Merge "Notif Settings polish" into sc-dev am: f6b42231e0 am: 1decee2f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14517130

Change-Id: Ia897d27dd59d19b4b61663f5a3cec7b2c5a20c8c
2021-05-20 01:42:42 +00:00
Jeremy Goldman
1902515854 Merge "Store whether the Dialog was previously dismissed" into sc-dev am: 0c28e9dca7 am: 659fada2f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518466

Change-Id: Ice0fc22cf2ca6432fa64f01f39c0ce95d2389509
2021-05-20 01:42:37 +00:00
Wesley Wang
02954909cc Merge "Update restriciton page to support legacy string" into sc-dev am: b769cf8067 am: b98a5659ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514137

Change-Id: Iee20db9752665c5aa9fb361311621810a97e7b19
2021-05-20 01:42:32 +00:00
YUKAI HUNG
202eb51f4b Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: e69e95fed1 am: 92898d2d77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518469

Change-Id: I321fddba8bb605eb4ff268427a0c8f00f63f6385
2021-05-20 01:42:27 +00:00
Arc Wang
79661a83dd Merge "Fix Storage Settings progress bar summary jank problem" into sc-dev am: 3a77c9c9e4 am: c2a4285c51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514140

Change-Id: Ia5005bda846b2718647cfa51d4276661d0ab0665
2021-05-20 01:42:22 +00:00
Kevin Han
9bf9c39414 Merge "Add tests for HibernatedAppsPreferenceControllerTest" into sc-dev am: 9351dde1e5 am: 6d45aafcfc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506400

Change-Id: I5132b79868941721a8dee653cd27b305bd264578
2021-05-20 01:42:16 +00:00
TreeHugger Robot
2af2e3b924 [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: 69ef5fd481 -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: Ief2b68f769595c661f60517767ccb836800402e1
2021-05-20 01:42:11 +00:00
Weng Su
3d92f14eb0 [automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: d4cec9b628 am: 1599278d12 -s ours am: 54b155bd81 am: e8fda0c0de -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: I6058007141d0f65271fa547f305027ff080dd8e8
2021-05-20 01:42:06 +00:00
TreeHugger Robot
98358ac1d7 Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a am: aa63f727d7 am: 879f4472ec am: 73523bcd1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316

Change-Id: I87f3487fd487500533bd53a81234164d5b145445
2021-05-20 01:42:01 +00:00
Hugh Chen
4e1bae816f [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: c556938807 am: 7b3da742d1 -s ours am: b548aa378d am: 8d75496467 -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: Ic6c7c4f28e6b8669e2e3dbd2301ff5821429d471
2021-05-20 01:41:55 +00:00
Yanting Yang
c19013be48 Merge "Update homepage summaries for Display and Security" into sc-dev am: 9c3424449e am: 76aee79238
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501878

Change-Id: I3977f6ad20a7a37c7bc985b5ff87334a667b2995
2021-05-20 01:41:50 +00:00
Ryan Lin
5f2e0c3a38 Merge "Fix incorrect layout in RTL" into sc-dev am: a2f47b3299 am: 213f18a2a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514126

Change-Id: If3cd91ffc24d769850c59abfe0555531c91c7ddc
2021-05-20 01:41:44 +00:00
Curtis Belmonte
0bf0f9b31e Merge "Consolidate face enroll intro/consent screens" into sc-dev am: 5ed928f626 am: 426fded7ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14510896

Change-Id: I72239463e0d11430d70774dbfc2aac7d27484ff1
2021-05-20 01:41:39 +00:00
Jason Chiu
db69423c4a Merge "Redesign homepage IA icon" into sc-dev am: cb88a7e24d am: 9ddaf4b7d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187779

Change-Id: I3ca58786d9352ae707090c8b206d112af6b12e53
2021-05-20 01:41:33 +00:00
TreeHugger Robot
477f5fcbe0 Merge "Fix task affinity for NotificationAccessConfirmationActivity" into sc-dev am: e5052a7b52 am: 1ebe8025d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14522955

Change-Id: I16590c3b9313961d0c7f3bdb808aab2bf8dbb779
2021-05-20 01:41:28 +00:00
Jakub Pawlowski
d72073923a [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: 7d84e30b19 -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: I86ddfdb6f69aa00c032a60bed1cdbb47b5ff86d8
2021-05-20 01:41:23 +00:00
Jakub Pawlowski
6abcf11475 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 123cb13df8 am: ed9a891fa1 am: 355dcf3757 am: d7364ca738
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I32ab894824845e05bfa49ffeac5e6fcbdc382b1b
2021-05-20 01:41:05 +00:00
Jakub Pawlowski
3cc3277bf7 [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: cebc80d634 -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: I5107a64e8146a2b08a27234f141b19f7cca5394a
2021-05-20 01:40:57 +00:00
Jakub Pawlowski
49ded2e4d2 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0 am: 7623ac8a68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ib590d102f1efbbb1d9ae684ee73e786ca2f09fa7
2021-05-20 01:40:39 +00:00
Abel Tesfaye
6ffe3735cf Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6 am: 3f37a074d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367

Change-Id: I5bbd3ce8431ad95d41ee80f1b573ca08c4603882
2021-05-20 01:40:31 +00:00
Abel Tesfaye
dd45f932a2 Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev am: 43905b3459 am: 766b3d099a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14430041

Change-Id: I0b0618e4aa9d8f9115a2a4f376bf367019ae0c5a
2021-05-20 01:40:26 +00:00
Lucas Lin
b810535de9 [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours am: e5fcc54bfc -s ours am: eb65d2eede -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: If5bc74a2e4bcbab0e87ba6488634e2eedebebc12
2021-05-20 01:40:20 +00:00
Kevin Chyn
58d0cd72cd Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11 am: 1de4861f75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399

Change-Id: I988ddd0204362232a568469c9de9ac85a963c10d
2021-05-20 01:40:13 +00:00
Simon Wingrove
f82d9ce3fa Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e am: 6b741c5a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179

Change-Id: Iae2c15820833b62fcd5e52c885faac8eaaec0ea3
2021-05-20 01:40:08 +00:00
YUKAI HUNG
6e2642a553 Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4 am: a3f81730fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139

Change-Id: If70220fe1600a3eef6eebf71c83de4482b004c01
2021-05-20 01:40:03 +00:00
TreeHugger Robot
be44924b75 Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev am: 839207436b am: ab1088f14d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14489518

Change-Id: I6b7044b243f630981dbd8dae2dd55a9b0776bd40
2021-05-20 01:39:57 +00:00
Wesley Wang
0c31e6f14f Merge "Update battery charging status string" into sc-dev am: 0f8673407a am: 10b2fb5ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514133

Change-Id: I445d4aa2d8176878f6effb2825b6f05a7e47f9f9
2021-05-20 01:39:52 +00:00
TreeHugger Robot
4a3a153855 Merge "Fix NPE on guest user" into sc-dev am: 1f9e88377c am: 4cc160c9dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14505816

Change-Id: Ic43b7a25afeb0b56442582ffb139db80b63f37e5
2021-05-20 01:39:46 +00:00
TreeHugger Robot
d43b614e38 Merge "Don't show DND access settings in managed users" into sc-dev am: 4784df542d am: 43d219b8dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470058

Change-Id: I9dc69cc864681e7d877ee33389a69ab83c0d0af6
2021-05-20 01:39:41 +00:00
Wesley Wang
c1c254d8e3 Merge "Update battery state string" into sc-dev am: e966debfd5 am: 82bfe543b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495886

Change-Id: I64ae8b41f6d6ac02f8e641f9f9728363fd4acff5
2021-05-20 01:39:35 +00:00
Betty Chang
0d0c31ca26 Merge "[GAR] Change the text color for "Airplane mode is on" message to follow the GAR" into sc-dev am: 8081c1fbdc am: 4e6c1e163b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501879

Change-Id: Ib29490ce841d049076b69ecee1dd43463afeb94c
2021-05-20 01:39:29 +00:00
YUKAI HUNG
e12a3e8814 Merge "Clear static icon and label cache if ui mode is changed" into sc-dev am: d78cd7272d am: 8d9e565cc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514123

Change-Id: Ic0f349aa402e97146b9979735405fde677afec55
2021-05-20 01:39:24 +00:00
Menghan Li
7b27f0eab2 Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev am: fd05966f4f am: 3117ab7481
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493677

Change-Id: I262a395d847432fdff50c261fb953b00db6d93b8
2021-05-20 01:39:19 +00:00
Menghan Li
a3a9e20118 Merge "[Material Next] Support "Learn more" for help link" into sc-dev am: 7bdf791e6c am: 8accadcc1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486196

Change-Id: I4178f60ecd800247463dd3ab531559a4e5a2a331
2021-05-20 01:39:14 +00:00
TreeHugger Robot
0781b3edbd [automerger skipped] Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035 am: fb67b5622f -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: I4faf24a2f22c3c565314924a5f1f7f661af22c77
2021-05-20 01:39:08 +00:00
Betty Chang
6ac0f93c53 Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev am: d3cbec6488 am: d90197803c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493684

Change-Id: I8eca9d92d0893302ee4220f0ed95c0df91e9d90e
2021-05-20 01:39:03 +00:00
TreeHugger Robot
38274729bb Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb am: 2d5890dbc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218

Change-Id: Icedf67d81565b75ea96d805c31f23dff46a95817
2021-05-20 01:38:58 +00:00
YUKAI HUNG
fcfadf487b Merge "Should not show internal package entry in the usage list" into sc-dev am: 0d00ace0d2 am: 71a918dcf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511219

Change-Id: Ie5a59710fd115ee70c356e4ef2f3ce78de3c0f12
2021-05-20 01:38:52 +00:00
Kevin Han
e3ff529a4c Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev am: 421c4e3efc am: b166743a41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471254

Change-Id: I33ea61c56aab7c961fac0d3e19531ccaf6a1ab06
2021-05-20 01:38:47 +00:00
YUKAI HUNG
e8ad2f4e6b Merge "Remove unnecessary converting us to ms" into sc-dev am: 899845b1ee am: b6caad5bee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503323

Change-Id: I8ecb6a9fb3136b6e66be676cbddac579e1017028
2021-05-20 01:38:42 +00:00
TreeHugger Robot
a51f9b5312 Merge "Add tests for guest user events" into sc-dev am: abd44a8a2e am: 1b4b63a253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491474

Change-Id: I385f3041ebb689b1c7e4799a36c261285481ab36
2021-05-20 01:38:37 +00:00
TreeHugger Robot
b219cc5c13 Merge "Fix color contrast problem for VPN page" into sc-dev am: bc4f3817da am: d1e6384343
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14468618

Change-Id: I2d4ffe3fe1c01c904563245bdb9d7712b65e84d5
2021-05-20 01:38:31 +00:00