PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,340 Commits 1 Branch 0 Tags
5081cc5afecdb0fbb0edd0559c436e35520924f0
Commit Graph

19168 Commits

Author SHA1 Message Date
Treehugger Robot
060a56468d Merge "Revert "Back up the smooth display setting"" into udc-dev 2023-04-28 09:58:16 +00:00
Chaohui Wang
8470122ad1 Fix ImeiInfoPreferenceControllerTest 
For test case updatePreference_simSlotWithoutSim_notSetEnabled,
mSecondSimPreference is a mock, instead of check the default value of
isEnabled(), verify it's setEnabled() not called.

Fix: 279880808
Test: RobolectricTest
Change-Id: I72064820754e053def46bdbf10317189c7ac608f
 2023-04-28 15:53:44 +08:00
Edgar Wang
d6ebd9536b Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: 2d4d23ecb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I9424a29754daf09057eef3e516c813dff88aca94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:52:50 +00:00
Edgar Wang
4637c3fd95 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 am: 386b3b662b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I84910f3c449ecc8e1d3805e414654c492f0c2249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:52:48 +00:00
Edgar Wang
386b3b662b Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012

Change-Id: I94a6521cf1967c028faa657228cc909f2b1b3895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 06:09:16 +00:00
Edgar Wang
8155b72cf8 Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev 2023-04-28 05:28:14 +00:00
Tom Hsu
c3f08dcf56 Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 2bc75c0d5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: Id8451b6b130cfccca0061f8aa9529c0783635641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:06:33 +00:00
Tom Hsu
1e2ecf3e2e Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 am: 39b150171b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: Id2f4e945fc893315f15f4f58e0f114187b5edb19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 04:06:24 +00:00
Tom Hsu
39b150171b Merge "[Settings] UI part: Add metrics for language" into udc-dev am: bd9263b391 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844

Change-Id: I49425eb7c992008e5dc7f0d028c82e4bee41038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:23:39 +00:00
Tom Hsu
bd9263b391 Merge "[Settings] UI part: Add metrics for language" into udc-dev 2023-04-28 02:49:59 +00:00
Piotr Wilczyński
9797fc8d15 Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: I3f3058996ac6418ce8df4e888b0959830276ac31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:53:05 +00:00
TreeHugger Robot
f48a328ac8 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: 9e2e3e9ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: Ib258aa7845d1da749b43cce636a489a8d844322e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:22:17 +00:00
TreeHugger Robot
bb49ef02f9 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed am: d1ebd886db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I7007257549a53aabbede5faed635066bb8f82a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 20:22:15 +00:00
TreeHugger Robot
9e2e3e9ae6 Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev am: 32602794ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22885040

Change-Id: I16732ae62948cd37f654d03739fc21973f9c754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 19:25:08 +00:00
TreeHugger Robot
32602794ed Merge "Fixed speed selection lost when changing password in Wi-Fi hotspot settings" into udc-dev 2023-04-27 18:55:20 +00:00
Becca Hughes
b74ca63c04 DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d am: 3107fb0f96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: I7a3458867b4e859011d0bf7c7eec59b653f240e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:46:42 +00:00
Becca Hughes
3107fb0f96 DO NOT MERGE Hide provider from this list if autofill provider am: 99f1d5448d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22792839

Change-Id: Ifde2d297be711a957ce900ec5c7f1d30601bc6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:11:36 +00:00
Becca Hughes
c74ccee659 Merge "DO NOT MERGE Hide provider from this list if autofill provider" into udc-dev 2023-04-27 16:35:18 +00:00
Piotr Wilczyński
eef23f441c Revert "Back up the smooth display setting" 
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3

Reason for revert: b/279215664

Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3

Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
Merged-In: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
 2023-04-27 16:13:03 +00:00
Piotr Wilczyński
1ab96c0b22 Merge "Revert "Back up the smooth display setting"" into udc-d1-dev am: 0066bdea3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22848698

Change-Id: I26bb2b04a543a22c619387ec41ae26e37f63aa8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 16:08:45 +00:00
Piotr Wilczyński
0066bdea3e Merge "Revert "Back up the smooth display setting"" into udc-d1-dev 2023-04-27 16:06:37 +00:00
Zoey Chen
cfaa13442c [Settings] UI part: Add metrics for language 
Bug: 279915462
Test: atest
Change-Id: Ie13c57b2b398beb48dfe0ac289ec336483575445
 2023-04-27 15:55:45 +00:00
Edgar Wang
4cf60b02b2 Fix test cases failed in WinscopeTraceTest 
Fixes: 276682211
Test: autotest
Change-Id: Id31d5c4e2e1dd61c4af24e042f4aaddee3d33439
 2023-04-27 10:22:29 +00:00
Edgar Wang
4a874fb50f Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: 3b9432dad2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: I47ca8520fd1da0142f733a1de62e0ecbfd773750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 09:44:55 +00:00
Edgar Wang
a74527da3d Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev am: e0049f0ae8 am: f4d498093b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22569798

Change-Id: If16496eca5a1a627046e9b3bc909e7ff9d4e0f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 09:43:52 +00:00
Edgar Wang
e0049f0ae8 Merge "Remove restricted icon in SettingsMainSwitchBar" into udc-dev 2023-04-27 08:27:42 +00:00
Weng Su
8c50edd1e7 Fixed speed selection lost when changing password in Wi-Fi hotspot settings 
- Use current SoftApConfiguration to build new SoftApConfiguration to keep unchanged properties

Bug: 279717060
Test: manual test
atest -c WifiTetherSettingsTest

Change-Id: I3ee7960b13b339445cc79c3d440f5c56c78c015f
 2023-04-27 14:55:52 +08:00
Grace Cheng
b4b04e0ac7 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: 68b55e2a0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I0dd5cd0424778067b617c23b89c5941c4d39c5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 03:22:15 +00:00
Grace Cheng
c1e5cc8891 Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: abdd8bcccc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825

Change-Id: I42c288d653bb1a22cfa910b94b37f595644d2b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 03:19:36 +00:00
Grace Cheng
54d1cfdae0 Fix flicker of “touch to unlock anytime” toggle 
Fixes flicker of toggle by setting not visible when launching confirm
pin/pattern/password or enrollment prior to displaying
FingerprintSettings. Also cleans up FingerprintSettings and
security_settings_fingerprint.xml to better separate SFPS and non-SFPS
logic and rename methods for clarity

Test: (manual) navigate to sfps fp settings and observe toggle doesn’t flicker
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsUnlockCategoryControllerTest
Fixes: 263843645
Change-Id: Ide3a666fc31b926ac14645dc22d090f77d81f901
 2023-04-27 00:29:09 +00:00
Becca Hughes
99f1d5448d DO NOT MERGE Hide provider from this list if autofill provider 
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.

Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
 2023-04-26 21:23:30 +00:00
Becca Hughes
02ca65edaa Hide provider from this list if autofill provider 
Since we are merging the two lists we should
hide the provider from this list to avoid
duplicates.

Test: local & unit
Bug: 279205251
Change-Id: I70ec4a4bda13bdcd5fd8f82f6ba6045e94d5daa9
 2023-04-26 16:19:51 +00:00
Edgar Wang
cd74f76a43 Remove restricted icon in SettingsMainSwitchBar 
- display disable status directly
- click disabled MainSwitchBar will show devicepolicy dialog
- make sure BT and location use MainSwitchBar correctly

Bug: 260406688
Test: manual
Change-Id: I8bb57213eec6dd5e991af580e1a06ebf8a867c28
 2023-04-26 14:06:22 +08:00
Treehugger Robot
a33d6c5061 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: 03ec360960 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: Ic38356dae643818061a9d06b4b1a81debcc2667a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 05:11:01 +00:00
Treehugger Robot
c06abe31b2 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev am: 9cdf565458 am: a71a381e59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762556

Change-Id: I5a7288c2e0ac86775071d966f8238836392456bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 05:10:46 +00:00
Treehugger Robot
9cdf565458 Merge "Restart Wi-Fi tethering automatically if configuration change" into udc-dev 2023-04-26 03:59:47 +00:00
Fangqiu Su
14dd0af87c Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 am: 29f3d022f7 am: 924208bb0f am: ef47b4b811 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I533e328fda6796e068f42b5477988a2448b156ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:38 +00:00
Fangqiu Su
57d3f995d2 Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb am: 378e7af38e am: 5ce99863ea am: 064c80b470 am: c606c6f0b2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I83c8b2d6d5d145be65b546d547bdd6a70777d7aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 21:47:04 +00:00
Fangqiu Su
13fdff36ea Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e am: 6b6044bedb am: 0f1ca5b569 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ie741b7c5244982a85336078ceccc606c25fea519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 17:49:58 +00:00
Matías Hernández
78b7892f2f Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c am: b168628c13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: I020f10a1b238245175e299a23bd3c48cdd89a241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 15:18:40 +00:00
Fangqiu Su
924208bb0f Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 am: 29f3d022f7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: If98e04dea79ae03a0f1cfe3969df530583c66289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 14:44:36 +00:00
Matías Hernández
cb13bd964d Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: I889dff9b16777539e8e8d9775c7ae3fe0bf462e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 14:37:35 +00:00
Matías Hernández
c49cb1014c Merge "Tweak refresh of notification channel group preferences" into udc-dev 2023-04-25 14:00:14 +00:00
Piotr Wilczyński
139bc341f3 Revert "Back up the smooth display setting" 
Revert submission 22741921-cherrypick-bug-211737588-lp9s6r5vn3

Reason for revert: b/279215664

Reverted changes: /q/submissionid:22741921-cherrypick-bug-211737588-lp9s6r5vn3

Change-Id: I9b50aa0e2c5a7d328c4aa70b049c37c81e49e89b
 2023-04-25 09:49:51 +00:00
SongFerngWang
539266a2f3 Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 am: c070721d96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I69ce2df75d1bee0eb1ad048bc253658e9af2ca62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 09:00:40 +00:00
Fangqiu Su
064c80b470 Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb am: 378e7af38e am: 5ce99863ea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I62bb7a4c90c78cf5631bdd933f8f6e0e9f64797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:59:00 +00:00
Fangqiu Su
29f3d022f7 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I932c3dfca81798867d20625d7cc7007dabbec0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:07:10 +00:00
Fangqiu Su
5ce99863ea Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb am: 378e7af38e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I5ddfb48e1809ce7c51163d30c0e283c3b3bc5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:05:33 +00:00
SongFerng Wang
f929dc6dea Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I25f24e707f42147d28101ed00da233b37218865e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:47:35 +00:00
Fangqiu Su
8d16e20d78 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I03bf08855b17f3a9d95fe00b4de68e97a62f4101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:24:07 +00:00