PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,774 Commits 1 Branch 0 Tags
4b7494f5c9a9456d336824cb15e33154253e05c8
Commit Graph

14795 Commits

Author SHA1 Message Date
Bonian Chen
d6f54ed90b Revert "[Settings] Convert to getSystemService(Class<T>)" 
Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I864a40f82ba9cb4170900ac0c1d77f781b17341f
 2021-03-31 09:37:03 +00:00
Yanting Yang
9916f07f3e Merge "Make work profile sounds section as its own entry" into sc-dev am: 6ef0b34a32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13887089

Change-Id: I819769ce85ccdb316600df7da4c55552a2be6982
 2021-03-31 08:37:28 +00:00
Yanting Yang
6ef0b34a32 Merge "Make work profile sounds section as its own entry" into sc-dev 2021-03-31 08:08:41 +00:00
Arc Wang
a1fb47beb8 Fix com.android.settings.deviceinfo.storage.StorageEntryTest 
StorageEntry#isStub() is unused and not built in apk.
Remove the method to fix test fail.

Bug: 184045592
Test: atest com.android.settings.deviceinfo.storage
Change-Id: I89d73c45111918c2ff01174d6fbb47f8c59f6968
 2021-03-31 10:05:09 +08:00
Fan Zhang
030ff66672 Merge "More settings button add test" into sc-dev am: 2d58e29ad9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017673

Change-Id: I787577510551a8ac6ce7b7cfddff7ca4c7e45802
 2021-03-30 20:30:21 +00:00
Fan Zhang
2d58e29ad9 Merge "More settings button add test" into sc-dev 2021-03-30 19:41:33 +00:00
Shireesha Bongarala
2043d31130 More settings button add test 
Bug: 179063896
Test:  make RunSettingsRoboTests -j40 ROBOTEST_FILTER=MoreSettingsPreferenceControllerTest

Change-Id: I99079165d32074ac0812bd62a146a9d238738fbc
 2021-03-30 17:09:57 +00:00
Peter Kalauskas
439a60643c Merge "Fix NPE in UserSettingsTest" into sc-dev am: 383ae7f025 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019935

Change-Id: I3813fa74f48c043d9d539e8b9997e1a2a1edb40f
 2021-03-30 15:19:39 +00:00
Peter Kalauskas
383ae7f025 Merge "Fix NPE in UserSettingsTest" into sc-dev 2021-03-30 15:01:16 +00:00
Yanting Yang
e14a3a3022 Make work profile sounds section as its own entry 
Also rephrase the strings by request.

Bug: 174964721
Test: manual
Change-Id: I760249cd48832f2739ab7ca33706cd11dd34a6b5
 2021-03-30 22:37:01 +08:00
Julia Reynolds
b3b92c996c Merge "Fix some 'clear recent issues'" into sc-dev am: 05c30a3f53 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14019938

Change-Id: Id5244f754140fdd68097407798363a62caec3087
 2021-03-30 14:21:49 +00:00
Julia Reynolds
05c30a3f53 Merge "Fix some 'clear recent issues'" into sc-dev 2021-03-30 13:41:58 +00:00
Almaz Mingaleev
edd4dea232 resolve merge conflicts of 7d9233302f to sc-dev am: dea929aa06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14032726

Change-Id: I3ce506516ee7e9f6ff4581705e4c150d10faa26b
 2021-03-30 11:58:28 +00:00
Weng Su
045b3eba93 Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev am: 4e341b780a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13990616

Change-Id: I5845d9691397f86ade3e69279d8e9c33a6f53b99
 2021-03-30 11:57:01 +00:00
Almaz Mingaleev
dea929aa06 resolve merge conflicts of 7d9233302f to sc-dev 
Change-Id: I7f6b7b035cc9c37a168e97ddeac5c8de9d5910de
 2021-03-30 11:43:33 +00:00
Weng Su
4e341b780a Merge "[Provider Model] Move the Internet unavailable Wi-Fi down" into sc-dev 2021-03-30 11:32:57 +00:00
Arc Wang
5db8f5ae05 Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev am: 21cf6c04db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13994999

Change-Id: Ib25fad04992539fb95bc32870a0ea28ab562a8c0
 2021-03-30 11:18:35 +00:00
Arc Wang
71ec654fcc Merge "Show "Files" category for public storage in Storage Settings" into sc-dev am: dd2f2f51e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13975110

Change-Id: Iea8ea56dfa32eca83adeb75b5fc98668af017b80
 2021-03-30 11:18:15 +00:00
Arc Wang
21cf6c04db Merge "Check config to decide if Smart Storage toggle should exist" into sc-dev 2021-03-30 09:49:48 +00:00
Arc Wang
dd2f2f51e0 Merge "Show "Files" category for public storage in Storage Settings" into sc-dev 2021-03-30 09:48:04 +00:00
Almaz Mingaleev
7d9233302f Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1652336

Change-Id: I8cce932794d13dd8f9424883b9521a823583f335
 2021-03-30 09:39:21 +00:00
Arc Wang
78bafc988a Check config to decide if Smart Storage toggle should exist 
Bug: 174964885
Test: AutomaticStorageManagementSwitchPreferenceControllerTest
Change-Id: I3090e3d1b01b18b3d0f68396671c8791321cc480
 2021-03-30 07:58:37 +00:00
Arc Wang
c626380689 Show "Files" category for public storage in Storage Settings 
Users can click this preference to see public storage files
in external file browsers.

Bug: 170918505
Test: make RunSettingsRoboTests ROBOTEST_FILTER=StorageItemPreferenceControllerTest
      manual
      Select private storage and public storage and observe UI
Change-Id: If3f0d59b2ebf941d70e81e60c4c2015b80e7cf33
 2021-03-30 15:51:49 +08:00
Wesley Wang
9d58d7455e Merge "Reset smart battery page switch component" into sc-dev am: 4559d22e51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017668

Change-Id: I723254c68196c75607d21d89a400164fee908abf
 2021-03-30 06:48:44 +00:00
Wesley Wang
4559d22e51 Merge "Reset smart battery page switch component" into sc-dev 2021-03-30 06:15:00 +00:00
Bonian Chen
e12af7c44d Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev am: fecfb7f5e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14022667

Change-Id: If7b7aed4d406cea84e118a9b8f9c29ae6206287d
 2021-03-30 05:37:24 +00:00
Bonian Chen
fecfb7f5e4 Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev 2021-03-30 05:31:52 +00:00
Weng Su
e8bd222753 Merge "Fix the broken test on WifiSettingsTest" into sc-dev am: ae80253161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017674

Change-Id: I1f8507c06c8ebff22a7f7c3dcf7321c389f768dd
 2021-03-30 03:26:12 +00:00
Weng Su
9950c9913d Merge "Ignore WifiNoInternetDialogTest failed test cases" into sc-dev am: 39bc92d1bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017681

Change-Id: I7e6f5b7d55fd59f81d0666980befe7ad58d11880
 2021-03-30 03:26:07 +00:00
Weng Su
2206513a4e Merge "Fix WifiTetherPasswordPreferenceControllerTest failed" into sc-dev am: 79fabbc249 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017678

Change-Id: If9abdd3046d5811760ef93803aefb9a4d92f6ff2
 2021-03-30 03:26:03 +00:00
Weng Su
a69a6b7045 Merge "Fix WifiTetherSettingsTest failed" into sc-dev am: ec31a6884c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017680

Change-Id: I2376c09cd8d970cf93030a30e905aecfdb86a939
 2021-03-30 03:25:58 +00:00
Weng Su
886701c344 Merge "Fix WifiTetherSSIDPreferenceControllerTest failed" into sc-dev am: cc9b424882 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017679

Change-Id: If58284817f89292298162a4d3ca0d6a7d8ad6f7c
 2021-03-30 03:25:54 +00:00
Weng Su
cbc4f34abc Merge "Fix WifiTetherFooterPreferenceControllerTest failed" into sc-dev am: 982e6d3c1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017677

Change-Id: Ib8389152a599773fd3cff58d15f0c6cc92be3b5a
 2021-03-30 03:25:50 +00:00
Weng Su
c1f4e51963 Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev am: b66207d17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14017675

Change-Id: I88551d806bc034daf463894609b0bd02cb6fe791
 2021-03-30 03:25:01 +00:00
Weng Su
ae80253161 Merge "Fix the broken test on WifiSettingsTest" into sc-dev 2021-03-30 03:03:36 +00:00
Weng Su
39bc92d1bc Merge "Ignore WifiNoInternetDialogTest failed test cases" into sc-dev 2021-03-30 03:03:12 +00:00
Weng Su
79fabbc249 Merge "Fix WifiTetherPasswordPreferenceControllerTest failed" into sc-dev 2021-03-30 03:02:58 +00:00
Weng Su
ec31a6884c Merge "Fix WifiTetherSettingsTest failed" into sc-dev 2021-03-30 03:02:43 +00:00
Weng Su
cc9b424882 Merge "Fix WifiTetherSSIDPreferenceControllerTest failed" into sc-dev 2021-03-30 03:02:27 +00:00
Weng Su
982e6d3c1e Merge "Fix WifiTetherFooterPreferenceControllerTest failed" into sc-dev 2021-03-30 03:02:09 +00:00
Weng Su
b66207d17a Merge "Fix the broken test on NetworkProviderSettingsTest" into sc-dev 2021-03-30 02:39:51 +00:00
Bonian Chen
234b698fb2 Revert "[Settings] Support getSystemService(Class<T>)" 
This reverts commit d5ccde31a8.

Reason for revert: failure on test cases

Change-Id: I0a179a6ebb5ef1dec566ce6e8facd5f3b82d7c8a
 2021-03-30 00:51:15 +00:00
Peter Kalauskas
d7a8b0eb21 Fix NPE in UserSettingsTest 
Also, introduce a check for ACTION_USER_GUEST_ADD being logged correctly

Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Bug: 183920589
Change-Id: Ie4fdf4b3429a9abec64120a38a13f2d8a3fa121a
 2021-03-29 15:54:01 -07:00
Julia Reynolds
4b301dba7a Fix some 'clear recent issues' 
- Don't show the button if nothing is clearable
- Optimistically remove preferences on pressing clear since the actualy
clear action is asynchronous

Test: RoboTests
Fixes: 178765511
Change-Id: Ic305d4d199b149078ea52a614cb93cebe55cd245
 2021-03-29 17:43:31 -04:00
Weng Su
41c8a68dab Ignore WifiNoInternetDialogTest failed test cases 
Bug: 183920404
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiNoInternetDialogTest

Change-Id: Ib69c982913d271be3c5fb85dd15fb06a9af021f8
 2021-03-30 04:34:06 +08:00
Weng Su
416bdecfa4 Fix WifiTetherSettingsTest failed 
- Use the same service name(Context.USER_SERVICE) to mock
UserManager.class

Bug: 183922231
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherSettingsTest

Change-Id: Ifa9f3affbb969425acea335732ce977f18f82b49
 2021-03-30 04:02:24 +08:00
Weng Su
6f2379bb44 Fix WifiTetherSSIDPreferenceControllerTest failed 
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183922071
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiTetherSSIDPreferenceControllerTest

Change-Id: I68955d83693dda787132e2a951e8d034e57090ce
 2021-03-30 03:42:10 +08:00
Weng Su
8abe0dfb92 Fix WifiTetherPasswordPreferenceControllerTest failed 
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183921878
Test: manual test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiTetherPasswordPreferenceControllerTest

Change-Id: Ib6ec5a806b10e73a5fefd4acf070a4ab1f69e0d7
 2021-03-30 03:31:50 +08:00
Weng Su
98746308cc Fix WifiTetherFooterPreferenceControllerTest failed 
- Use the same service name(WifiManager.class) to mock
WifiManager.class

- Use the same service name(TetheringManager.class) to mock
TetheringManager.class

Bug: 183921868
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest

Change-Id: I904c463f555c3c3c2a85272505215cf993474a7a
 2021-03-30 03:17:52 +08:00
Weng Su
f5b4e49073 Fix the broken test on NetworkProviderSettingsTest 
- Set the Provider Model feature flag to false

Bug: 183919739
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I44cfbe314ce82d67f10fe717054129ee849870a1
 2021-03-30 01:58:07 +08:00