Commit Graph

84522 Commits

Author SHA1 Message Date
YUKAI HUNG
74d44526fd Merge "Add new field for data interpolation usage" into sc-dev am: f988790908 am: 29cc5c19a0 am: 51650d3e59
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409677

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

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

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

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

Change-Id: I01742410f350224fb5f929a92b7aa5b327e09e55
2021-05-19 01:44:07 +00:00
TreeHugger Robot
9b45c2f15c Merge "Revert "Refine battery help message layout"" into sc-dev am: c3dc96ebc3 am: cdceaf3602 am: 34ea71e95c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14409960

Change-Id: I2316ad0c9fa9dcb2d218f0206f7254065e4d78a6
2021-05-19 01:44:02 +00:00
Mill Chen
cfa02fe9c6 Increasing the character limit am: b4a9916adf am: 71c15d3f18 am: b6fcf2e79f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408673

Change-Id: I2451fc17aa03f0114a04330ff33ffb9a90ebbe08
2021-05-19 01:43:56 +00:00
TreeHugger Robot
612e03b45e Merge "Update password & account settings icon size" into sc-dev am: b0bd79d468 am: ea8d23e3b1 am: dd9c4d37ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408664

Change-Id: I0792103f28a9b6159e5a5d1420e044cebce1ad63
2021-05-19 01:43:51 +00:00
TreeHugger Robot
ad1d5d94d3 Merge "Fix the unaligned title of injected items" into sc-dev am: d32e0cf8a6 am: a130f44094 am: 5d037d2196
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408661

Change-Id: I00ca2afa7f9db13dd4e566cad961db590705ad73
2021-05-19 01:43:45 +00:00
TreeHugger Robot
0c009f25a1 Merge "Update the category style in pair new device page." into sc-dev am: dc0613d172 am: dc9beae9ec am: d85c089e2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14408656

Change-Id: I804214242c34cb9feb458680ae0b8b59c1726342
2021-05-19 01:43:39 +00:00
Wesley.CW Wang
0811e513aa Refine battery help message layout am: 2369167d63 am: 0c97d1b69e am: 90ba23c812
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352143

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

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

Change-Id: I893f03d923c4d37a1fbc4f1c03ef97f451dde00b
2021-05-19 01:43:11 +00:00
Bill Yi
0b006bfe79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f1ae5d67a -s ours am: e8b350c1c8 -s ours am: b1d10f6842 -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: I896f4a13f2f1d7b3e8cf94a1d28db5f26e62ec6c
2021-05-19 01:43:06 +00:00
TreeHugger Robot
d3f4282b50 Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev am: 6907a1feb8 am: 670c578014 am: 1ccb74494d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352470

Change-Id: I4dbb9fe23e86416cad27f97012828cda463b3f69
2021-05-19 01:43:01 +00:00
TreeHugger Robot
59227c7792 Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1 am: 8133c1f6ad am: 02ed8d8778
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125

Change-Id: I9f3798deb6095c1195b9926fa3ec86b290137956
2021-05-19 01:42:53 +00:00
TreeHugger Robot
c77ebfc5d0 [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: 567e796e30 -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: Id0959f7169b2aec7f63a8b56cc392906bd368fbd
2021-05-19 01:42:47 +00:00
Bill Yi
8e6898749c [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: 4037c9d0ea -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: I17d51fcd2acfcce6f07d2dca1281e3e12b540a07
2021-05-19 01:42:42 +00:00
TreeHugger Robot
0a5ad368dd Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0 am: 4e563710b0 am: 61a2a7d3c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126

Change-Id: I5e5c877a0280a2eb8a13dc35926f65b0d32b4b5d
2021-05-19 01:42:37 +00:00
TreeHugger Robot
842b9c18be [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: 3a0cb3f14b -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: I4a8ea9d9438327a3a7bcba28d41bc25b309c1eea
2021-05-19 01:42:32 +00:00
Bill Yi
482e13d034 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours am: ff5e910f46 -s ours am: c55ee5997c -s ours am: ec6e1be6cd -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: Idcbbaa505f9a0e7476163853c012c7838eb5b68a
2021-05-19 01:42:27 +00:00
TreeHugger Robot
85f476b40a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours am: fa0c8a8ce8 -s ours am: 08bb852a30 -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: I415ea13d63e18542c8502cba9aa4abe1963d1dfd
2021-05-19 01:42:22 +00:00
TreeHugger Robot
b8058de016 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours am: dad62285d3 -s ours am: b558344188 -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: I19a20ff48d3fcb74188a4f746d759fdf8a6a4130
2021-05-19 01:42:17 +00:00
Menghan Li
551c4be638 Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3eabde60b9 am: 4b5dc6d262
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189

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

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

Change-Id: Idd8c9bd182ccf01e45f64b0b2111790be8573e64
2021-05-19 01:41:44 +00:00
Amit Mahajan
783cf977cb Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: a0726c49f9 am: b6f314f644
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728

Change-Id: I192a56c48314d6f809ba86e7ec7e44a9d47f47a7
2021-05-19 01:41:38 +00:00
Matt Pietal
7ff77d552d Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: fb9f7f8684 am: 85d62cac73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991

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

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

Change-Id: I73e1665b3a1ab4db6f05920d6f9df868d0ddeabb
2021-05-19 01:41:22 +00:00
Tsung-Mao Fang
aecbf690f6 [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: 8b8290a8e5 -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: I84562bae14e97cffa8b224b83dd7cf80c06fc460
2021-05-19 01:41:16 +00:00
Tsung-Mao Fang
cbf646d8ea [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: 500651cbb6 -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: I4eeb911c89a6454ccf8dba9f3eb1d19d8e9f819a
2021-05-19 01:40:59 +00:00
PETER LIANG
08e8d8bc88 Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 am: 6f438ebd9b am: 93351d6b0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864

Change-Id: I71c680b47b4b81f02070361b12c397a8507733ab
2021-05-19 01:40:43 +00:00
TreeHugger Robot
eb031f3b2c Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe am: 1b08a11dfe am: a91920fefa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809

Change-Id: Ibe579158a1209b0930e5ca4cac61a57c19dcc044
2021-05-19 01:40:37 +00:00
TreeHugger Robot
9f002fc44e Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1a10e00c54 am: 3b780d0618
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148

Change-Id: I11423d0140112556f2975aaa4e4d0310ec705180
2021-05-19 01:40:32 +00:00
TreeHugger Robot
4e64ce00c7 Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: e1e738b86f am: 0650af4347
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501

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

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

Change-Id: Idab5cfe9ed9dfb61e5f2b3e2556018a1a8b7c638
2021-05-19 01:40:15 +00:00
Yanting Yang
66a4de2468 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7 am: 29080c68b3 am: 03a9543682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: Ie2fde265acc89fb6485c49165c1c5fb689c7a8ed
2021-05-19 01:40:10 +00:00
YUKAI HUNG
0ee7784a75 Merge "Add battery usage metric" into sc-dev am: d2d7d89de6 am: 8bfc40046e am: 70f34c947e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I0896d142ac720ee0764d264cb3acf19f7329eda4
2021-05-19 01:40:04 +00:00
Abel Tesfaye
3d0f1c8185 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 am: 29a695b0c7 am: 8a8ad35cd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: I40e68a6a1f0fc1975bfe2fea23cc4b0490f51833
2021-05-19 01:39:54 +00:00
Bill Rassieur
c5fb557ce7 merge sc-v2-dev-plus-aosp to master.
Change-Id: I2583cc40da177a97f0412a27d6aa9598974801d8
2021-05-19 00:55:08 +00:00
TreeHugger Robot
b06835ad45 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2 am: 7dada139f5 am: 0b246618f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: I3e214a7880fa11ea2f6164c51c11bce28b940bbb
2021-05-18 19:31:00 +00:00
Chiachang Wang
d57ada7e3b Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465 am: e5d4adc69e am: 27130d5ce9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

Change-Id: I6d0145ac5e7f873de8f2d31c079a90df86e8ae75
2021-05-18 18:36:10 +00:00
TreeHugger Robot
0aa920488b Merge "Wrap generating battery history keys into another method" into sc-dev am: 5c2a472b39 am: 9fce90e953 am: 3fc655482f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542665

Change-Id: I9e8ea2b0dbff0e2301bbbec3308d15e668b77b35
2021-05-18 18:33:35 +00:00
Stanley Wang
f5fcecffc7 Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2 am: 96431d2f81 am: 5d6410dbd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: I2c97badf6ac4a984526d483bbcf6e740898a8168
2021-05-18 18:33:29 +00:00
TreeHugger Robot
10ede26c8a Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev am: f6712e330a am: 5c3a065926 am: 094cfbd9af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439452

Change-Id: I6b84820bea3d147cbaa9acea5396df21f15610e3
2021-05-18 18:33:24 +00:00
Treehugger Robot
d997fdb990 Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610 am: d70199e634 am: 3a5720b95f am: d7a8602192
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I306310f0e69654e45325b50e3029a1a05cdd6ff5
2021-05-18 18:33:18 +00:00
TreeHugger Robot
4c637d36fe Merge "Account settings: Fix duplicate title and extra padding." into sc-dev am: 52f627f9ef am: 5390257b90 am: c816d52137
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14488985

Change-Id: Ia06fa3ddd77382861f617366d41bc757c527fc3a
2021-05-18 18:33:11 +00:00
TreeHugger Robot
ebb207a2b1 Merge "Fixed extra padding in "Open by default" page" into sc-dev am: 8b9f1d4f9e am: b151225fae am: ee2bb5e698
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540523

Change-Id: I7dd872deb2ef73611b013e5434351481793bbe8a
2021-05-18 18:33:05 +00:00