TreeHugger Robot
|
fe0be1f2c1
|
Merge "[Security Report] Fix RequestToggleWiFiActivity overlaid issue" into sc-dev am: 6907a1feb8 am: 598e7456f2 am: 6e7c049c36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352470
Change-Id: I356abd40dcbd4a6da0f932477a94dcc9d8f71526
|
2021-05-16 12:44:12 +00:00 |
|
TreeHugger Robot
|
98087a87c1
|
Merge "Add placeholder values to placeholder settings" into sc-dev am: fb2e8837f1 am: 570ef9d8da am: c7174aaed4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356125
Change-Id: I1ae231240822fc1673a2bb9c323a739c544202de
|
2021-05-16 12:44:06 +00:00 |
|
TreeHugger Robot
|
5d9dedf424
|
[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: 390d29bf2c -s ours am: 520800b85b -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: Ie6c7461214fd67c80a02783c9e48a604c586c7b0
|
2021-05-16 12:44:00 +00:00 |
|
Bill Yi
|
17eb99a106
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 090db24c56 -s ours am: b702fdea6d -s ours am: 226146afee -s ours am: c9b99fbf00 -s ours am: 11d3658112 -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: I6dc8f51bd313f91c8ff6b018aedd163a71e0f95b
|
2021-05-16 12:43:53 +00:00 |
|
TreeHugger Robot
|
7b5698aaca
|
Merge "Retain and restore showSystem state when rotated" into sc-dev am: 8f8666e3d0 am: 56a3e57991 am: 5f9b1866df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14356126
Change-Id: I3286e48a3109124acde6df8e7b0418a35ccae563
|
2021-05-16 12:43:47 +00:00 |
|
TreeHugger Robot
|
63d19a74f5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: fb47f1e143 -s ours am: bf0ef5b73a -s ours am: 26fb969e07 -s ours am: 765a422ef8 -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: I70f3a142db57d32837df95c5f6ee9f1d63b94f7a
|
2021-05-16 12:43:41 +00:00 |
|
Bill Yi
|
147301007d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6bb78b6d1b -s ours am: ff5e910f46 -s ours am: 7ed3955572 -s ours am: 6e48fa7abf -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: If9195c7d3040509e943f9741193ae0505f2f54be
|
2021-05-16 12:43:36 +00:00 |
|
TreeHugger Robot
|
f513638f95
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6c7771a521 -s ours am: 016f441365 -s ours am: b32fd28bc0 -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: If94f590ffeaaf06aa96fbfb3968c6e268ca74e20
|
2021-05-16 12:43:14 +00:00 |
|
TreeHugger Robot
|
2a2df28f63
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 041b99ccd5 -s ours am: e30f685d83 -s ours am: 58bc66b149 -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: I821c57f6c28fbecbb39b2ebcc950136e02d8e85b
|
2021-05-16 12:43:09 +00:00 |
|
Menghan Li
|
9755b67ad8
|
Merge "Improve search by adding the settings keywords for supported framework feautres" into sc-dev am: 1576980095 am: 3e0080956d am: a52bf99fd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299189
Change-Id: I9491d048f48e57f5eff15b67328f0ab543239274
|
2021-05-16 12:43:02 +00:00 |
|
Almaz Mingaleev
|
3e02295b00
|
Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9 am: e291bcfdd8 am: af9aa076df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353668
Change-Id: I541e583a01642298325a1952f5ad7bdeb1821f0a
|
2021-05-16 12:42:54 +00:00 |
|
Yi Jiang
|
de8779d73b
|
Merge "Fixes 'no ripple effect' issue for screen attention setting" into sc-dev am: 16b0f660ae am: 2b25a6cec4 am: 240ef2d1e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114425
Change-Id: I846ff120ff1257d4747488415767d08b647dd4f8
|
2021-05-16 12:42:48 +00:00 |
|
Amit Mahajan
|
10a77391fe
|
Merge "Fix incorrect logging." into sc-dev am: 6402ac45e6 am: 748bbd8a06 am: 93b4b46cf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330728
Change-Id: Ieab741c898b72bd2dfc9f4048c3b6f9b5adf21b9
|
2021-05-16 12:42:42 +00:00 |
|
Matt Pietal
|
98fa222811
|
Merge "SUW - Apply theme to FRP PIN pages" into sc-dev am: 0ddacf1152 am: eadf475e12 am: d17b6d022a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339991
Change-Id: I93b5404916608793bd666bce6e3beb79d88b8a79
|
2021-05-16 12:42:35 +00:00 |
|
Tom Hsu
|
c66db025c2
|
Merge "[ApnEditor] Create another string id for translation" into sc-dev am: 58fb70f8d6 am: 0a930e3e91 am: 7c7f779b71
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327014
Change-Id: I2f56641f9024811ab72db843b75d80bf8ba7811f
|
2021-05-16 12:42:29 +00:00 |
|
Wesley Wang
|
baaf2528c8
|
Merge "Make app usage page active time support time period" into sc-dev am: 04e14e41f0 am: ec3961fab1 am: 37fa9c79fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297857
Change-Id: I95f3255373400e0fc6a68e7323888bc443749225
|
2021-05-16 12:42:23 +00:00 |
|
Tsung-Mao Fang
|
66640f55b1
|
[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: 2e807e4f0b -s ours am: 96a4e396fb -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: I7e849ec60b94eee516b724ed415dd2ad8405c333
|
2021-05-16 12:42:17 +00:00 |
|
Tsung-Mao Fang
|
e93f24a315
|
[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: bb4c367e7d -s ours am: 7e98abea92 -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: I2f551901f9eeb195b74ce5185a724aa5ebd2f824
|
2021-05-16 12:42:00 +00:00 |
|
PETER LIANG
|
01fa89f737
|
Merge "Update the BC style for the vision settings in SuW." into sc-dev am: 9246f6f8b0 am: 5db9770aba am: fb789f0c06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319864
Change-Id: I74fa4aedb3408d1e102f1884b0e64028e02a76d6
|
2021-05-16 12:41:44 +00:00 |
|
TreeHugger Robot
|
b85fd1350d
|
Merge "Settings: Turn Privacy hub on by default." into sc-dev am: 7bdbe80abe am: d481442b83 am: 42c65e6b49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14339809
Change-Id: Ib52daca012efedc7dd27a845bf2f5123d4231ef7
|
2021-05-16 12:41:36 +00:00 |
|
TreeHugger Robot
|
6826430e7f
|
Merge "Fix several challenge paths" into sc-dev am: fcb325c562 am: 1533fd1e11 am: 9891597029
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148
Change-Id: Ic8ea57bfc3dac3979d5a489146d33890b1ce02bf
|
2021-05-16 12:41:31 +00:00 |
|
TreeHugger Robot
|
8fe8200279
|
Merge "Remove icons of Location Services and App location permissions" into sc-dev am: 3eb980d41b am: 3006e0473b am: 7063ea4ef1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14341501
Change-Id: Ie58196d7552805d89fa162159ff9f76e183d8ab0
|
2021-05-16 12:41:25 +00:00 |
|
TreeHugger Robot
|
bc429b68ce
|
Merge "Apply settings page transition" into sc-dev am: d3de9a1352 am: cfc3968b4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14292669
Change-Id: I0f06edeae744d2eec88737c0630b802918309b4e
|
2021-05-16 12:41:18 +00:00 |
|
TreeHugger Robot
|
dd84da1983
|
Merge "Tweak spacing for private DNS mode dialog" into sc-dev am: b07079dab8 am: dd31e73878
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319873
Change-Id: I6e168b5d750f4b4077fd755fe953a859feea48f1
|
2021-05-16 12:41:12 +00:00 |
|
TreeHugger Robot
|
4082c0b1e5
|
Merge "Make collapsing toolbar load font synchronously" into sc-dev am: 9d3442bd47 am: 77f7afac7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327008
Change-Id: I699a8b694b4227cb32cbc480bf1890268a8a12e9
|
2021-05-16 12:41:07 +00:00 |
|
Hugh Chen
|
e96f830c8b
|
Fix usb tethering switch back to none after off/on the screen am: ddafb202bd am: 433dbcc6f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297855
Change-Id: I0b7edc2981d56920ef0253ceccdcd0c134ca7fae
|
2021-05-16 12:41:01 +00:00 |
|
TreeHugger Robot
|
7e66a3a13a
|
Merge "Bring the search icon back in developer page" into sc-dev am: e06f5a93b1 am: b17996e9bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293744
Change-Id: Ib18c4f79e28a1bd35187b650698b373f5a63e601
|
2021-05-16 12:40:56 +00:00 |
|
SongFerng Wang
|
c26f8788f7
|
Merge "Ui show "No connection" when WiFi is turned on and no available network" into sc-dev am: 03fbae7fc5 am: 3333935a67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281929
Change-Id: I477a0f9bb7bea46e72dd6aafdc7ed28a111e2a1f
|
2021-05-16 12:40:41 +00:00 |
|
Tom Hsu
|
45e3441821
|
Merge "[Provider model] Show no connection during out of service." into sc-dev am: 463805b142 am: 563198613f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187782
Change-Id: Ie03e422ab560dbcb81f4624bcb6c6d4393856941
|
2021-05-16 12:40:34 +00:00 |
|
YUKAI HUNG
|
14073ff231
|
Merge "Update string for battery usage footer to include charging info" into sc-dev am: 40114d8cf1 am: 8b589f1a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14327007
Change-Id: I4b5f20073f58bbce3cb20a55d43ebd1a46dc61b9
|
2021-05-16 12:40:28 +00:00 |
|
YUKAI HUNG
|
aab9f4fd34
|
Merge "Draw timestamp information into BatteryChartView manually (2/2)" into sc-dev am: 70c872c160 am: 5f84a08a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319868
Change-Id: If407f7ff97d4483ba5210a4105edea1e65036369
|
2021-05-16 12:40:23 +00:00 |
|
Kevin Chyn
|
625f1c3523
|
Merge changes from topic "new-fp-strings" into sc-dev am: 77ddf11ae6 am: 28f4ca0eb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330069
Change-Id: If12a722516aa6c41c12a6d38c7ba29ca7872857f
|
2021-05-16 12:40:17 +00:00 |
|
Kevin Chyn
|
f99f893238
|
Update FingerprintEnrollIntro text and icons am: 28d635d9aa am: e7772a480e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14330066
Change-Id: Icab250db023c64e51a807f675770d8a25deea781
|
2021-05-16 12:40:12 +00:00 |
|
TreeHugger Robot
|
b7ec3843f2
|
Merge "Revert "Remove "See all" button"" into sc-dev am: e37695c89d am: b9b4fc5d12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14324027
Change-Id: I6d325004daf9b1a7ccef91ed152ddc9b7040b128
|
2021-05-16 12:40:05 +00:00 |
|
Alex Johnston
|
5c6fbeca91
|
Merge "Correct string ConfirmDeviceCredentialActivity" into sc-dev am: f3be8a6cc8 am: 26790a85ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296227
Change-Id: I43b64730bc2f2741c2b59201e06fc5d3105c4138
|
2021-05-16 12:39:59 +00:00 |
|
Jakub Pawlowski
|
d7c13da873
|
Fix app name label spoofing am: 54e74cae5f am: 3aad6a6fc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076525
Change-Id: I684d6f92af9c37a382a0966c629e5aac02301f54
|
2021-05-16 12:39:53 +00:00 |
|
Adam Bookatz
|
9e2c27b03d
|
Merge "UserDetailsSettings uses Guest string, not Guest name" into sc-dev am: e035a81ddc am: d231fdcaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282598
Change-Id: I775b9db3f8ba1751c52cda6e4493c33c80b7d4b4
|
2021-05-16 12:39:48 +00:00 |
|
Automerger Merge Worker
|
d6865f2a00
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697411518c -s ours am: 81aaadca0e -s ours" into sc-dev am: 7fe923eec3 -s ours am: 65644f1ad6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326566
Change-Id: Ic39fd69a3c4d340b6e2770e8ec21a2a8039f2def
|
2021-05-16 12:39:38 +00:00 |
|
TreeHugger Robot
|
5464daa668
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e8413529ce -s ours am: 0509118fc5 -s ours am: a869b41995 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326564
Change-Id: I80b35c9d7224b2f4ba77c1f307cf87e32d2fcfe1
|
2021-05-16 12:39:33 +00:00 |
|
Automerger Merge Worker
|
8095abe04d
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c430db5ca3 -s ours" into sc-dev am: 8b3e1ed7ac -s ours am: b6dc76e6dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326565
Change-Id: If238b23a30886bacf954aa6f3aea6b626aaae4fc
|
2021-05-16 12:39:28 +00:00 |
|
TreeHugger Robot
|
4c62c3631a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 4fd6557446 -s ours am: 8d58c02b06 -s ours am: 9761ce3e93 -s ours am: 2f4509dfb9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326567
Change-Id: If13ffc20155c0598e042645c936fe1edacace543
|
2021-05-16 12:39:23 +00:00 |
|
TreeHugger Robot
|
d7bd44cc53
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f69ba03181 -s ours am: 981f61e134 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326573
Change-Id: I97f4dc301132ab7165b6598fe44aa1829aaa441a
|
2021-05-16 12:38:56 +00:00 |
|
TreeHugger Robot
|
997ac9c39e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a2a94ad379 -s ours am: 4ef2e056ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14326571
Change-Id: I01502c4de50bb33874a82d5afbbfc8ecee76d3b0
|
2021-05-16 12:19:32 +00:00 |
|
Tsung-Mao Fang
|
55a0cd4b06
|
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 9d5a7aa322 am: 59463e3e04 -s ours am: 744dd99af4 -s ours am: dcc3304de4 -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/+/14167797
Change-Id: I478e925228c82ff1c1aa5f0cc1dfbb9defdff32b
|
2021-05-16 12:19:27 +00:00 |
|
Tsung-Mao Fang
|
cb92db428a
|
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c am: 6ac45a7ceb am: f470b78ff2 am: 92d5e58003 -s ours am: 78de74aa57 -s ours am: 546d95c57d -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/+/14167797
Change-Id: I3a6efbec8bae26d4837065dca5d690427ffe3380
|
2021-05-16 12:19:12 +00:00 |
|
YUKAI HUNG
|
8b2530dcea
|
Merge "Draw timestamp information into BatteryChartView manually (1/2)" into sc-dev am: 95b5d0393d am: 014706d450
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319865
Change-Id: I4a1723f10641e6492f86fe2eef40679c320ff6b8
|
2021-05-16 12:18:58 +00:00 |
|
Jeremy Goldman
|
e451b8f10b
|
Merge "Combine 5G and recommended strings" into sc-dev am: f1ee6987e6 am: 85de104c6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14233637
Change-Id: Idd17b17f645b56f323fd06739e5aa913e3bbe221
|
2021-05-16 12:18:53 +00:00 |
|
Yanting Yang
|
1b92097b81
|
Merge "Update homepage icon for Wallpaper & style" into sc-dev am: 72ba46a9bb am: f846e9108b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14319863
Change-Id: Ib1580d5016bf22e0da619f5dfb09cc99fd60a1a3
|
2021-05-16 12:18:47 +00:00 |
|
Lucas Lin
|
1233fd660c
|
Merge "Use [set|get]PrivateDnsMode directly" into sc-dev am: 614f653aeb am: 97dd9ed21b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14230401
Change-Id: Iac7973488799f4d289c8d99603b55e23c971e21a
|
2021-05-16 12:18:42 +00:00 |
|
Joy Babafemi
|
5396036173
|
Merge "Update UWB toggle state with a getter API" into sc-dev am: 4b19eae08b am: 6e2ee60708
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283946
Change-Id: I398115313dcb1685329c630c1e39a69e64f1492e
|
2021-05-16 12:18:37 +00:00 |
|