Commit Graph

84530 Commits

Author SHA1 Message Date
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
ykhung
0b5efe1d2e Keep selected time slot and expand state when device is rotate am: 9ef9e1ee0c am: c4f49166ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503317

Change-Id: I0d9bc645266a0633e68b92b7ffc62af3298ae0da
2021-05-20 01:38:26 +00:00
TreeHugger Robot
ed3a40cf55 Merge "Set storage volume spinner not clickable when only 1 volume" into sc-dev am: 2853e766f5 am: 697d2da647
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495884

Change-Id: I434e94949617cfbf6f1001808ccad48181b69580
2021-05-20 01:38:21 +00:00
TreeHugger Robot
3934496f41 Merge "Disable the info icon" into sc-dev am: 0fa1e491f8 am: e6239a7571
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493678

Change-Id: I90d2c0ab2972bc10ab196132d3821cca08c91bae
2021-05-20 01:38:15 +00:00
PETER LIANG
60490151e1 Merge "Provide a way to Accessibility button settings via intent." into sc-dev am: f2d70ab320 am: ce6b1d35ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14008225

Change-Id: I4756713abf7c7a7d5a19eb44ae90c6026ac3dfab
2021-05-20 01:38:09 +00:00
Menghan Li
e80f624ec1 Merge "[Material Next] Move “main switch” right below illustration" into sc-dev am: 16e8c767f1 am: 2cba3a3dbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486917

Change-Id: I40436383c0a142899a6e75d9d3b8854a4bb754ee
2021-05-20 01:38:03 +00:00
Joe Bolinger
0e0dd6ae04 Merge "Add userId parameter to all uses of challenge in settings." into sc-dev am: 93f6a257e9 am: 82f0a27a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14472474

Change-Id: I313785db218650782b695145f2cd830a11b4cdbd
2021-05-20 01:35:29 +00:00
Hai Zhang
c266d2db9e Merge "Don't add SettingsLib to static_libs in Settings unit test." into sc-dev am: 8a7f55246f am: 4da838e124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14491512

Change-Id: Ib3a5167395850c04ea19405a22dd77bf3c34d720
2021-05-20 01:35:24 +00:00
TreeHugger Robot
e9a26d6b95 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9d3c9dd867 -s ours am: cefbb1d83a -s ours am: 82c1e0ae12 -s ours am: 8426c52d77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17ff87810af7517d4795a6bb098d84f22559a112
2021-05-20 01:35:18 +00:00
TreeHugger Robot
3f9f09da12 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 842c67d794 -s ours am: 84ed78af0a -s ours am: d1625e0793 -s ours am: b426fb7e37 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ce2e31cbb59724b41121e4f2361be241fd2ebf4
2021-05-20 01:35:14 +00:00
TreeHugger Robot
582aadf7ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e81db4e2f0 -s ours am: 647e0ee2ad -s ours am: 986469d9d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id37c59fad6200442730d3fc35c9b1e509d19b084
2021-05-20 01:35:09 +00:00
TreeHugger Robot
b82e4f2a62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 860318bab8 -s ours am: 2231cba3d1 -s ours am: c445e3b913 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2151afaa38924debf9d02c940b126962c929b302
2021-05-20 01:35:04 +00:00
TreeHugger Robot
b63fe0ebd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3772f9137a -s ours am: f2aa2d1af3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00ffe93ab643a432f92c0d81b8d5daf63ff5392d
2021-05-20 01:34:40 +00:00
TreeHugger Robot
79e3700ecb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 126fc5b912 -s ours am: 52fcdc9981 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0bcad5984e059987fc2bd1bfc27d060972088ec8
2021-05-20 01:34:34 +00:00
ykhung
616976857a Refine graph top margin and expand/collapse icon theme color am: 525659c291 am: 93039a52ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493692

Change-Id: I3787741256f8ebe20b38760b0460617e121102a1
2021-05-20 01:34:29 +00:00
TreeHugger Robot
2c9881e71e Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 9ebe07d216 am: 63cc6f167a am: d31c3649ba am: 5367a742a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I0bca9f3ae187c2a85208e06831893996a91c38e3
2021-05-20 01:34:23 +00:00
Hugh Chen
5e26bba491 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe am: e90fdbf747 am: 445869a724 -s ours am: 0f74d4831c am: 665d8ff15a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5a72078936b2ad60937c4dc11f3cc616c7d958e
2021-05-20 01:34:14 +00:00
TreeHugger Robot
2c20af69aa Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: 0e37bc27a2 am: a6f32496f2 am: 9ff09ba818 am: 8eb197536a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I3122c99bfff8069662d40a49a2f2ba811a73a708
2021-05-20 01:34:08 +00:00
Hugh Chen
321e04b430 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 425430345d am: 47666c2d15 -s ours am: 33228acc37 am: 8a55d1e5b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I861114c715c985b37eb655c1aa247ee066b452db
2021-05-20 01:34:00 +00:00
TreeHugger Robot
09909bf739 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 256de04464 am: 3942491a7f am: e492441e16 am: 190a890b75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I52584b3c006c35a69555536433d557635a11f5a3
2021-05-20 01:33:54 +00:00
Hugh Chen
0fd0831e57 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: 6fee770ea0 am: 8bf67a7f4b -s ours am: 0bc5e289a4 am: 212cf6e457 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I831701c1fc1762030dc2061d2d00276ee3407f09
2021-05-20 01:33:46 +00:00
TreeHugger Robot
b26025af7d Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: e790b378c3 am: 8be84e5e36 am: dff59b4188 am: 067fff3ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I9e1b580516e95731aea2fc0d187f3b3c5ff80c07
2021-05-20 01:33:40 +00:00
Hugh Chen
6e8e7bc11e [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 -s ours am: 933f807885 am: c740d7ad82 -s ours am: 5d7d1a6b38 am: 862b656d87 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ied84f453046f2c2438cadf32a4594b97e886f738
2021-05-20 01:33:34 +00:00
TreeHugger Robot
588a0c0d47 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951 am: 045aa65893 am: 8b76d88e55 am: 2097ca6a73 am: dd263fe2f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I9acd049b2f29bcc41623386e42751c113c9b1aa8
2021-05-20 01:33:29 +00:00
Hugh Chen
6ac20f5138 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours am: 8dbc94fcbe am: 68f4157827 -s ours am: 628a92c252 am: 1d1f933697 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iff8a0c28caaaeab38a4aa4ad762c3e1c7e5d5f52
2021-05-20 01:33:20 +00:00
TreeHugger Robot
485eac7e6b Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa am: e5e19dd41a am: b2c3b4f4cb am: 8cea64eae5 am: aaa7f412e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I5722c4fe098b08c8661cac8cfa44d5cdb298e80b
2021-05-20 01:33:14 +00:00
Hugh Chen
da55df0e0f [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 0248e7b7cf -s ours am: caf59cbbcf am: 67d317d977 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07161757b86e548eb666ee8313e9ee5c651efb67
2021-05-20 01:33:07 +00:00
TreeHugger Robot
381fba8512 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 am: 872093e29d am: 058f6400ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I49339e5d47ba4fb0b1e0f153b20459a6428a0dfc
2021-05-20 01:33:01 +00:00
Hugh Chen
002687888f [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours am: 7eeee9be6a am: b0638ab0a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifeb3b6596847498347e11513c6a47fe56e4e02f6
2021-05-20 01:32:54 +00:00
TreeHugger Robot
af9a7806e2 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c am: a9924a96f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I9c4aebaa76914be1367dd15fa5b3aef79a7b390d
2021-05-20 01:32:47 +00:00
Hugh Chen
b3604e7b94 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b am: f49ac4dd4a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65ce7b507aae92a97b0da9c6e2b82507ef19be63
2021-05-20 01:31:03 +00:00
Wesley.CW Wang
8539f31111 Fix color check error am: 7a8d2f4486 am: c261b0bfba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: I5e7a119b128cc70720b08e7d726d0c05de422fff
2021-05-20 01:27:48 +00:00
YUKAI HUNG
a09b05856b Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 am: b8ce43a2ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: I87a639b3214fa613c4b4ca3a338b9e471a84b096
2021-05-20 01:27:42 +00:00
Jason Chiu
8de8920f0c Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 am: 3ea3c99e16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I7ed6b01ac124f4cd60c415a1ed831385c5173494
2021-05-20 01:27:36 +00:00
Wesley Wang
2549bc1976 Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: a28add07a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: Ia9f71a01ab4462d8f8b3fa0f66de0c5000424066
2021-05-20 01:27:29 +00:00
Wesley Wang
7e47f96e57 Merge "Update battery usage summary" into sc-dev am: 56488ef84b am: e15e791a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I11a782f55acbbf537d0e185e8497f1650175e479
2021-05-20 01:27:22 +00:00
Julia Reynolds
0b8d7cca32 Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 am: 468e4af75f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: I1ac5509110e06fd4b697ab9a9dd24438c4df8b73
2021-05-20 01:27:15 +00:00