Commit Graph

82471 Commits

Author SHA1 Message Date
Dmitri Plotnikov
c2515e9c20 Merge "Replace uses of SystemBatteryConsumer with aggregate BatteryConsumers" into sc-dev am: 501eea7fa2 am: 6acbd70713
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14346184

Change-Id: Iec4786aa45cfdb52a388a3710123aa950c67b3b7
2021-05-15 05:16:13 +00:00
TreeHugger Robot
fbb3409f9b Merge "Storage Settings Apps category shows image/video/audio APPs" into sc-dev am: 8d1fd73e89 am: e0e26649fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14186629

Change-Id: I11cef62cf2588c52cc0fdcf96b2141f67f96ef5e
2021-05-15 05:10:47 +00:00
TreeHugger Robot
c38bda35bf Merge "Update apps icon in Sound > Media page to correct size." into sc-dev am: 80daf4fc49 am: 07427eeeb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14410003

Change-Id: Ib2e27d4df23976717c0428e1d142c68909d1ffc4
2021-05-15 05:10:40 +00:00
Yichi Chen
3c5b65fb20 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev am: ffbea30a18 am: 97efa6eed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352150

Change-Id: I466e4394ef08941bd0498280dac87c4fa89e17b2
2021-05-15 05:10:34 +00:00
TreeHugger Robot
f7191fd0a3 Merge "Remove reserved icon space for Safety > Wireless emergency alerts" into sc-dev am: 001dcc9e93 am: 21f81feb86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409961

Change-Id: Id93ba1a59043d553a72333aa8e1264e5db86cdb1
2021-05-15 05:10:29 +00:00
YUKAI HUNG
51650d3e59 Merge "Add new field for data interpolation usage" into sc-dev am: f988790908 am: 29cc5c19a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

Change-Id: Id736caeaacf64af4f1b6cb0d2f11ea09d6b6c40f
2021-05-15 05:10:24 +00:00
Ryan Lin
ddc3ecb071 Merge "Move Magnification Mode Settings to the main page" into sc-dev am: 194015b774 am: 9d46a4fec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327003

Change-Id: I6d74fc57872b63b69784d940ca68838156db954f
2021-05-15 05:10:11 +00:00
Menghan Li
124dd2d99a Merge "[Material Next] Update accessibility tool footer style" into sc-dev am: da60d4e842 am: 484782bc2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260604

Change-Id: I9194417e13b26deaa8cbc2f91d585e33f8761e2c
2021-05-15 05:10:06 +00:00
Menghan Li
7be990b3a2 Merge "Hide the accessibility location preference when gesture navigation mode enabled." into sc-dev am: c7ddea6aa8 am: cc938176bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408665

Change-Id: I4d8603ce0bc346b40cc871b6925c671663b967cc
2021-05-15 05:10:01 +00:00
Menghan Li
55159685c5 Merge "[Material Next] Audio adjustment customized seekbar" into sc-dev am: 8270d175b8 am: 055eed3d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409958

Change-Id: I10a3fcc0eba3ca481df8b621568a31c3952d7128
2021-05-15 04:59:54 +00:00
TreeHugger Robot
34ea71e95c Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3 am: cdceaf3602
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960

Change-Id: I8cd4a4e14de77054aacd9d72d310419ff9d3a4bf
2021-05-15 04:59:50 +00:00
Mill Chen
b6fcf2e79f Increasing the character limit am: b4a9916adf am: 71c15d3f18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673

Change-Id: I3431221fa8041418400fb3c02dcc096c92f028dd
2021-05-15 04:59:45 +00:00
TreeHugger Robot
dd9c4d37ab Merge "Update password & account settings icon size" into sc-dev am: b0bd79d468 am: ea8d23e3b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408664

Change-Id: Ib22149efa4c4e368302ecb52be8469e47d4e47e5
2021-05-15 04:59:42 +00:00
TreeHugger Robot
5d037d2196 Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6 am: a130f44094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661

Change-Id: I4ad357c34c6a951b5d815f3602bfed5a6852b76c
2021-05-15 04:59:37 +00:00
TreeHugger Robot
d85c089e2c Merge "Update the category style in pair new device page." into sc-dev am: dc0613d172 am: dc9beae9ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408656

Change-Id: I19751e75e2620207e8d400e96915e99e63ebf08f
2021-05-15 04:59:33 +00:00
Wesley.CW Wang
90ba23c812 Refine battery help message layout am: 2369167d63 am: 0c97d1b69e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352143

Change-Id: I8126f0b029012411e7b0dc0ed37e7afc98e4d695
2021-05-15 04:59:28 +00:00
Wesley Wang
b17fb7541e Merge "Update batter saver page footer (1/2)" into sc-dev am: 12bc0921ce am: 1a9df9004f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352147

Change-Id: Ic1de13b76f1708176b10ec377d56e71817945b2b
2021-05-15 04:59:23 +00:00
YUKAI HUNG
213a6c6bce Merge "Refine the app/system section divider content show/hide rule" into sc-dev am: 16b60aa2d7 am: bc91fe41da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327009

Change-Id: Ie4dc31c22d70e1bcc7a06992a6e188985c208af2
2021-05-15 04:59:05 +00:00
Bill Yi
b1d10f6842 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f1ae5d67a -s ours am: e8b350c1c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3be124c4e9b7b5abfa7dce8d1d7032a822de3853
2021-05-15 04:58:39 +00:00
TreeHugger Robot
1ccb74494d Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev am: 6907a1feb8 am: 670c578014
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352470

Change-Id: I62356d3937223d562379589a84d701e0a3f4e5f8
2021-05-15 04:58:35 +00:00
TreeHugger Robot
02ed8d8778 Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1 am: 8133c1f6ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125

Change-Id: I9cc6afc223b48e0961bc35574ea6114940572051
2021-05-15 04:58:30 +00:00
TreeHugger Robot
567e796e30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 01aeea2e4a -s ours am: b1802372ab -s ours am: c830499aa5 -s ours am: 43d2800863 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibffbcd2e69c3668f29b2b53c86a5fbce153812a5
2021-05-15 04:58:26 +00:00
Bill Yi
4037c9d0ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours am: 226146afee -s ours am: 93c1e94f12 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31709aff30a77ff1ee5f6f8d7df650a1f2246acb
2021-05-15 04:58:22 +00:00
TreeHugger Robot
61a2a7d3c4 Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0 am: 4e563710b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126

Change-Id: If9d983d90bfaba928c5e1aed3915c046ebf5af53
2021-05-15 04:58:18 +00:00
TreeHugger Robot
3a0cb3f14b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours am: bf0ef5b73a -s ours am: 3693498d2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I203b65d8d8e04a468a5e9745cf5a1fd70f8ef5ae
2021-05-15 04:58:12 +00:00
Bill Yi
ec6e1be6cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours am: ff5e910f46 -s ours am: c55ee5997c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I90efca069329e865bda097854bb1bd1823e75611
2021-05-15 04:58:08 +00:00
TreeHugger Robot
08bb852a30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours am: fa0c8a8ce8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0c8962df2043f08a9afdfda8a169905d2a4474c
2021-05-15 04:57:51 +00:00
TreeHugger Robot
b558344188 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours am: dad62285d3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie62f9b64f4770c7a982eddfba00f89f9706586c1
2021-05-15 04:57:47 +00:00
Menghan Li
4b5dc6d262 Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3eabde60b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189

Change-Id: I0823499310f9ee17edf5d818db7e0a6e13a3f8d6
2021-05-15 04:57:41 +00:00
Almaz Mingaleev
d8069cd1c1 Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 am: 74d2521f17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668

Change-Id: I04ed64bf974ec7492c6d72a53794d1bd13f538c3
2021-05-15 04:57:19 +00:00
Yi Jiang
f73eb64d59 Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae am: d6e7c97468
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425

Change-Id: Id6211516feaafd5214e35d3a08f50f1cf0b53598
2021-05-15 04:57:14 +00:00
Amit Mahajan
b6f314f644 Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: a0726c49f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728

Change-Id: I4435d1179679477159aba6a0b7187e1d223ca8b8
2021-05-15 04:57:10 +00:00
Matt Pietal
85d62cac73 Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: fb9f7f8684
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

Change-Id: I2584f9cf212a58d160ac7afb87dc2a9ebc4526d2
2021-05-15 04:57:05 +00:00
Tom Hsu
9466addf62 Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 am: c86c00f6b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014

Change-Id: I4262eb46525d3c776526a23f13a2a0eca276de89
2021-05-15 04:57:01 +00:00
Wesley Wang
ee87ae9754 Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 am: 7e29471cd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857

Change-Id: Ibf9032b177ec506cbc9b07e24699543e3dd52206
2021-05-15 04:56:56 +00:00
Tsung-Mao Fang
8b8290a8e5 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 697a73dfdf -s ours am: c12e5f2455 -s ours am: ea699a1d2c -s ours am: a68dc4738b -s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I5dd4e0300bd8a6bf53858ae2938e826d9a91e339
2021-05-15 04:56:52 +00:00
Tsung-Mao Fang
500651cbb6 [automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8 am: 26f3013c32 -s ours am: 4d7853f35c -s ours am: 4c05b195d7 -s ours am: a66212e11d -s ours am: 656dcf8334 -s ours am: 5fb1fd0ca8 -s ours am: 72072cff42 -s ours
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 80c3f6d4d8 is already in history

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

Change-Id: I27c37a2484d90d876f1dddff3e9263c60b91c6ef
2021-05-15 04:56:36 +00:00
PETER LIANG
93351d6b0a Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 am: 6f438ebd9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I6c61f94b1d12411451e5265fac51b8a0d58c6c39
2021-05-15 04:56:22 +00:00
TreeHugger Robot
a91920fefa Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe am: 1b08a11dfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: Ia8bfbb1d78bfc1de899a11f15acc94ad55034f85
2021-05-15 04:56:17 +00:00
TreeHugger Robot
3b780d0618 Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1a10e00c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: I544ec89f2b6e0340685d407420b707cde8a14e87
2021-05-15 04:56:13 +00:00
TreeHugger Robot
0650af4347 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: e1e738b86f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

Change-Id: I25091ee1e7f9eee0517fe3e0f54fe2973848bd5e
2021-05-15 04:56:04 +00:00
Kevin Chyn
f7c0b05375 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a am: 3d69810107
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: Ia701cb3005629ae43bce408433bbf8ad9f15d1ba
2021-05-14 21:41:13 +00:00
Kevin Chyn
3d69810107 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: Idacfc71f1e120f50f9f4846d5e5622da0754cbf4
2021-05-14 21:28:17 +00:00
Kevin Chyn
15d75cf59a Merge "Fingerprint image is not important for a11y announcements" into sc-dev 2021-05-14 21:06:11 +00:00
TreeHugger Robot
2aef91719b Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28 am: 5f6f2a4b58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

Change-Id: Ie84e42dcbd76ae53a73a72a3fc39b3f22f2e06c4
2021-05-14 20:05:16 +00:00
TreeHugger Robot
5f6f2a4b58 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

Change-Id: Ia3495c19a5b230f2a938c3f9c3cf34f67da41d43
2021-05-14 19:53:14 +00:00
TreeHugger Robot
8355121c28 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev 2021-05-14 19:33:01 +00:00
Yanting Yang
03a9543682 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 am: 29080c68b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: I403cba576a5096c9ded80b08e4b13b1d570033e5
2021-05-14 18:50:46 +00:00
Yanting Yang
29080c68b3 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: I8ef251f1c9222ad7f8d4e9dd30a7f3f51b8da26a
2021-05-14 18:36:37 +00:00
YUKAI HUNG
70f34c947e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 am: 8bfc40046e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: If86edd6d47b199e001ee0bb672f96f3075983fc2
2021-05-14 18:17:56 +00:00