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 |
|
TreeHugger Robot
|
d21bcdaaa0
|
Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev am: c3dfd37df6 am: fee3049603 am: c847bf6b08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540524
Change-Id: Ic191dfe9c784e889c60ed81feafa0e2b5e8a3e64
|
2021-05-18 18:32:59 +00:00 |
|
TreeHugger Robot
|
56c84ee6ad
|
Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev am: e01099b245 am: 22f1137335 am: 9f2ac978a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515939
Change-Id: I925c6a7887bdaa7bd98e249db9dd2aa50b3b78b8
|
2021-05-18 18:32:53 +00:00 |
|
Yanting Yang
|
b4cf27cee4
|
Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e am: 1e14321bfe am: 7a4588d348
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526
Change-Id: I85125e6f133fe72d878d7c550bbc017148466eed
|
2021-05-18 18:32:41 +00:00 |
|
YUKAI HUNG
|
3acf017a70
|
Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: f70cb82b0c am: 185c38f26c am: 9b31388f0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515927
Change-Id: I6d2e333d02c239e0487d004f9e13967a5140329d
|
2021-05-18 18:21:47 +00:00 |
|
Tiffany Nguyen
|
e939d670bb
|
Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f am: 77728801c2 am: e3a46ae42a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486116
Change-Id: If7bbd82ae297cf4acd395807c6578f4fb6b56b5e
|
2021-05-18 18:21:40 +00:00 |
|
Kevin Chyn
|
d5e870fd92
|
Merge changes I9dea35a7,Iddcc0a65 into sc-dev am: bcc288e801 am: 29366ad429 am: 0060445136
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14531459
Change-Id: I3d2bde6253a25baf32a6926e8c4ab595f206320b
|
2021-05-18 18:21:33 +00:00 |
|
Julia Reynolds
|
42ba688e27
|
Merge "Fix vertical alignment in history" into sc-dev am: 14f204af54 am: 494d01bd76 am: cca752b350
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14532408
Change-Id: Ifc24ef2710fe00842441953dd321ca98f055abd2
|
2021-05-18 18:21:26 +00:00 |
|
Julia Reynolds
|
c9fbf42562
|
Use | not , am: 78c4e70cf6 am: eeb455e63a am: 62cf042047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14534046
Change-Id: I23e816138103642785dcb2221ccf5443767136a1
|
2021-05-18 17:38:14 +00:00 |
|
Bill Yi
|
d12b7dd0b1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b7b6f180b -s ours am: 5ab07c89a2 -s ours am: 3d867d50f5 -s ours am: c092945258 -s ours am: ab131311c9 -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: I7ca966c387a7502f861e9fbc070dbba3f097f459
|
2021-05-18 17:37:00 +00:00 |
|
Bill Yi
|
fccead18b6
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 933340766b -s ours am: 64e44f83b9 -s ours am: df3c661db7 -s ours am: 1f3e91e040 -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: I668ed6eba498f6267fd3efecd479690add7cab6f
|
2021-05-18 17:36:54 +00:00 |
|
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 |
|