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
ba061c91ef
Merge "Controls/Pay - Use new privacy setting" into sc-dev am: 4335268c81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14551073
Change-Id: If9642ede2761b0aee37a7afff15317b861e84d90
2021-05-19 00:08:03 +00:00
TreeHugger Robot
4335268c81
Merge "Controls/Pay - Use new privacy setting" into sc-dev
2021-05-18 23:55:18 +00:00
Yi Jiang
816b1f6edc
Fixes ScreenTimeoutSettingsTest
...
The recently added Battery Saver Preference need to be initialized in
order to avoid NPE in testing.
Bug: 188499083
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Change-Id: Ib6553bcf9ed86eb46c2e0950064e34439664a1ee
2021-05-18 15:54:21 -07: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
Chloris Kuo
0e30c2599f
Merge "Fix NAS dialog string" into sc-dev am: 074eee332a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14607898
Change-Id: I856d8740ee4c90343e7cd4da2e1349efca331d33
2021-05-18 18:20:17 +00:00
Weng Su
4bf9551c30
Improve discoverability of the intent & actions progress
...
- Display "Select the network you want to use for data" on sub-title
when Wi-Fi networks is not empty
- Screenshot:
https://screenshot.googleplex.com/6nuwYoSh7UjF93Q
Bug: 186432232
Test: manual test
atest -c InternetConnectivityPanelTest
Change-Id: I9ab0ce0ca052b3444e50a914b59f38e4e7778ddf
2021-05-19 02:17:33 +08:00
Chloris Kuo
074eee332a
Merge "Fix NAS dialog string" into sc-dev
2021-05-18 17:54:50 +00:00
Weng Su
3d2950c8af
Introduce new Disconnect functionality for Wifi networks in Internet
...
Panel only
- Display the close icon on the Wi-Fi network connected to the Internet,
and performs the same action as tapping on the carrier network when
tapped it.
- Display the cog icon on the Wi-Fi network if it has no the Internet
access.
- Screenshot:
https://screenshot.googleplex.com/YBQ8onG2dFJ8Q2a
Bug: 187995278
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Id54a94c1fdfc37aff5cc37d6fb9f5478c0dccb00
2021-05-19 01:52:05 +08:00
Mill Chen
a96dad0a09
Apply color extraction for Fingerprint enrollment
...
Bug: 183710937
Test: visual verified
1) Navigate to Settings > Security > Fingerprint unlock
2) Follow the flow to register a fingerprint
3) See and check if the icon is applied to the new color
Change-Id: Ia1119c9fb245e0e1ed8257416d2942368a45e9e1
2021-05-19 01:46:20 +08: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