Commit Graph

77880 Commits

Author SHA1 Message Date
Chloris Kuo
9ab4a070ad Add Toast to show notification importance reset is completed.
Test: make RunSettingsRoboTests, manual test on device
Bug: 172467473
Change-Id: I5f024c82fedf4dc596dcece9ea2f2444f9d86ad5
2020-11-16 07:59:20 +00:00
TreeHugger Robot
d58a9cdd05 Merge "[Provider Model] Preferences Settings UI change" 2020-11-16 06:35:07 +00:00
TreeHugger Robot
564eaec283 Merge "Use UserManager.removeUserOrSetEphemeral() to remove current user." 2020-11-16 02:50:12 +00:00
Weng Su
6bf7b1a72f [Provider Model] Preferences Settings UI change
- Change the title from “Wi-Fi preference” to “Preferences”
- Change the summary from “Wi-Fi turns back on automatically” to
“Connect to public networks”
- Remove “Turn on Wi-Fi automatically” preference
- Screenshot:
  https://screenshot.googleplex.com/Areywyb46deK9VQ
  https://screenshot.googleplex.com/6H5Z4PxA5tWXZ6S

Bug: 172788645
Test: manual test
Change-Id: Ibce21f1d740a139b407a0a9a41f2cb4c4e34776c
2020-11-15 20:14:25 +00:00
Zoey Chen
baa56fac45 Merge "[Provider Model] Add new API to detect" 2020-11-15 16:04:13 +00:00
SongFerng Wang
b61853f468 Merge "[TeseCase] unify the getResourcesString" 2020-11-15 15:05:39 +00:00
TreeHugger Robot
5816d414db Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-11-14 16:27:20 +00:00
TreeHugger Robot
97fc2c307a Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-11-14 16:15:20 +00:00
Bill Yi
3a8d05dcac Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If33102942ce38a7209290e083aa8be1a8ad122f3
2020-11-14 04:30:07 -08:00
Bill Yi
c01d91718c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic97c03d99302de94c505a0ee5b5aa6279a03f526
2020-11-14 03:44:57 -08:00
Weng Su
d9c04f773b [automerger skipped] Merge "Fix the bug of losing Wi-Fi certificate when editing" into rvc-qpr-dev am: 3b4744a6c1 am: 6cb2744f20 -s ours
am skip reason: Change-Id I947fb7668ffa7e9ed8c150fe14e6ae9d7a67393c with SHA-1 c95baa2317 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13053207

Change-Id: Ib9de68b588fc5dcbecdbb864bfd1bc60f9bacb5f
2020-11-14 07:12:03 +00:00
Weng Su
6cb2744f20 Merge "Fix the bug of losing Wi-Fi certificate when editing" into rvc-qpr-dev am: 3b4744a6c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13053207

Change-Id: Ie039198adf4f4693df68f7d37fc4579ea209a1ce
2020-11-14 07:01:16 +00:00
Weng Su
3b4744a6c1 Merge "Fix the bug of losing Wi-Fi certificate when editing" into rvc-qpr-dev 2020-11-14 06:32:55 +00:00
Fan Zhang
a86afbaf19 Merge "No-op refactor on EmergencyGesturePreferenceController." 2020-11-13 23:21:07 +00:00
Felipe Leme
8031c0bbac Use UserManager.removeUserOrSetEphemeral() to remove current user.
Test: manual verification
Bug: 173245580
Bug: 155913815

Change-Id: I74ac8d276f3a78f6c9483a980e4a05486b0c1a8c
2020-11-13 15:15:32 -08:00
TreeHugger Robot
2cc6f6cdce Merge "Sync main branch with QPR branch changes" 2020-11-13 21:07:05 +00:00
Fan Zhang
d7c833278b No-op refactor on EmergencyGesturePreferenceController.
Move custom intent launching logic into a separate controller
(EmergencyGestureEntrypointPreferenceController).

This is in preparation of a mini-IA refresh and fixing a search
bug. The custom intent logic is only needed by the entrypoint
pref, and putting in the gesture PrefControler makes any fix
hard to implement.

Bug: 171067360
Bug: 172609395
Test: RunSettingsRoboTests
Change-Id: I1e26393872bfada98db80a1cc33e3e13dacb086b
2020-11-13 20:01:20 +00:00
Sally Yuen
3f74b1f520 Merge "[Reduce Bright Colors] Move persist preference" 2020-11-13 16:26:08 +00:00
Zoey Chen
7233f63139 Merge "[Provider Model] A mock of WifiCallingQueryImsState for unit test." 2020-11-13 11:49:30 +00:00
Zoey Chen
3abe48ef38 [Provider Model] Add new API to detect
1. current connection is mobile data
 - remove the SubscriptionsPreferenceController#activeNetworkIsCellular() and move into MobileNetworkUtils
2. isProviderModel API
 - Add it in Util for Provider Model
3. isWiFiCallingEnabled
 - remove WifiCallingPreferenceController#isWifiCallingEnabled() and move into MobileNetworkUtils
4. Add nes test case for MobileNetworkUtils

Bug: 171873895
Test: atest -c MobileNetworkUtilsTest
Change-Id: I4bfdf0537fe07d064d6c0ba4a2c44b4a4f158d91
2020-11-13 18:01:10 +08:00
Zoey Chen
80328dc307 [Provider Model] A mock of WifiCallingQueryImsState for unit test.
Copied it from MockWifiCallingQueryImsState which is existed in robotests

Diff: https://diff.googleplex.com/#key=DgvbruCHVQpt

Bug: 172053880
Test: manual
Change-Id: I8255db70fe7916e6ac18b56a646a6761bbda106b
2020-11-13 18:01:01 +08:00
SongFerngWang
ea6b1e2312 [TeseCase] unify the getResourcesString
Bug: 173099559
Test: atest PreferredNetworkModePreferenceControllerTest  (PASS)
atest OpenNetworkSelectPagePreferenceControllerTest (PASS)
atest MobilePlanPreferenceControllerTest            (PASS)
atest MobileDataPreferenceControllerTest            (PASS)
atest Enhanced4gLteSliceHelperTest                  (PASS)
atest AutoSelectPreferenceControllerTest            (PASS)

Change-Id: I9a2e3d69cbd933a1282d51b7d8869e6a1ec4cb14
2020-11-13 15:53:55 +08:00
TreeHugger Robot
65e48f80c8 Merge "Ignore failed tests" 2020-11-13 07:43:05 +00:00
TreeHugger Robot
73771d1c3b Merge "Update emergency gesture strings to match mock" 2020-11-13 07:37:24 +00:00
Weng Su
224948fd7e Fix the bug of losing Wi-Fi certificate when editing
- When the saved certificate is loaded into the UI, the EAP method
spinner will trigger a redundant item selection event to refresh the
certificate to the default value.

- Filter out redundant item selection event of the EAP method spinner.

- Analysis report:
  https://docs.google.com/document/d/1uzyO0NQsT0PVT-ZKbWtDTt4KRXvm3L994MmZTXZ4d5Y/edit?usp=sharing

Bug: 161569880
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=WifiConfigController2Test
Merged-In: I947fb7668ffa7e9ed8c150fe14e6ae9d7a67393c
Change-Id: I00b73b4bfc078aca37396aab4c802a3de64318cf
2020-11-13 07:32:34 +00:00
Edgar Wang
9cf24d3c8a Merge "Update the summary of AoD when Bedtime mode is on" 2020-11-13 07:14:34 +00:00
Tsung-Mao Fang
1ab23cbd74 Ignore failed tests
Test: Run robo test
Bug: 173167839
Change-Id: Ie153cba4cff5c64bb4d861110a30d973a216b3c4
2020-11-13 13:58:01 +08:00
Sally
2a9e9cf1eb [Reduce Bright Colors] Move persist preference
Moved below to the Options Category per feedback.

Bug: 128465252
Test: preference is moved to Options category
Change-Id: Ia5bfd1b12aa9ad3bccbbe91caf928829b788ae92
2020-11-13 04:03:47 +00:00
Weng Su
2f5b869124 Merge "Fix the bug of losing Wi-Fi certificate when editing" 2020-11-13 03:43:13 +00:00
Weng Su
6ec5cdf06a Merge "[Provider Model] Non-carrier data usage settings UI change" 2020-11-13 02:50:06 +00:00
SongFerng Wang
8096d70c58 Merge "[Testcase] To migration DisabledSubscriptionControllerTest" 2020-11-13 02:37:18 +00:00
Sarah Chin
396934a092 Sync main branch with QPR branch changes
Original change (ag/13006754) was modified to merge in QPR
(ag/13023201). Adding the same changes to the main branch to keep it
consistent.

Test: make RunSettingsRoboTests
Bug: 167643728
Change-Id: Iedf14d2c2ac9181c9aad0ed929b19ffeb60560b2
2020-11-12 15:58:46 -08:00
Fan Zhang
f2e0ce0278 Update emergency gesture strings to match mock
https://screenshot.googleplex.com/9FjBjPY4bsPCMwU.png

Bug: n/a
Test: visual
Change-Id: Ie86c58f7b57f82d9fc8e4ef14f17b9d9b14b724a
2020-11-12 12:07:20 -08:00
Sarah Chin
38528b02a8 [automerger skipped] Merge "Update signal strength on ServiceState in service" into rvc-qpr-dev am: 854b1837c9 am: 8535314ea1 -s ours
am skip reason: Change-Id Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7 with SHA-1 3b3704d693 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13023201

Change-Id: I7f7211a1f1dff6ae81eef6c270d2c981255c8ca6
2020-11-12 19:41:41 +00:00
Sarah Chin
8535314ea1 Merge "Update signal strength on ServiceState in service" into rvc-qpr-dev am: 854b1837c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13023201

Change-Id: I293cbeac40d8019cb725fb11fbd24dac89a5d756
2020-11-12 19:22:30 +00:00
Sarah Chin
854b1837c9 Merge "Update signal strength on ServiceState in service" into rvc-qpr-dev 2020-11-12 18:46:40 +00:00
Julia Reynolds
3ca057adf0 Merge "Fix contact name issue" 2020-11-12 15:24:58 +00:00
Edgar Wang
391217977f Update the summary of AoD when Bedtime mode is on
Since Bedtime mode can suppress AoD, after reviewed by UX, we decide
update the summary to "Unavailable because Bedtime mode is on" when AoD
is suppressed by Bedtime mode.

Bug: 168790245
Test: manual & robotest
Change-Id: Id2511cb0ad93b44f6bf701a707b7ddef9438653d
2020-11-12 21:47:15 +08:00
SongFerng Wang
9489e8128d Merge "[Testing] To migration DefaultSubscriptionControllerTest" 2020-11-12 13:30:16 +00:00
Weng Su
d9d9224c0f Merge "[Provider Model] Remove “Use Wi-Fi” switch" 2020-11-12 12:38:35 +00:00
Jeremy Goldman
bd23d56b55 Merge "Underlying telephony library interface changed, updating tests accordingly." 2020-11-12 09:32:21 +00:00
TreeHugger Robot
2db0228637 Merge "Fix CDMA roaming and subscription mode tests" 2020-11-12 08:57:22 +00:00
Sarah Chin
62efb18365 Update signal strength on ServiceState in service
Test: make RunSettingsRobotTests
Bug: 167643728
Change-Id: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
Merged-In: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
(cherry picked from commit 3b3704d693)
2020-11-12 00:42:53 -08:00
Weng Su
890d3e039b [Provider Model] Non-carrier data usage settings UI change
- Change the title from “Wi-Fi data usage” to “Non-carrier data usage”
- Change the warning message from “Carrier data accounting may differ
from device accounting” to “Excludes data that is used by carrier
networks”
- Screenshot:
  https://screenshot.googleplex.com/3bicWHu7g5StH8R
  https://screenshot.googleplex.com/AqceQBtY4AqnuGH

Bug: 172788855
Test: manual test
Change-Id: Ic4d6e5dbb0b7d1d851f6cf033d400a7f780261ac
2020-11-12 08:04:35 +00:00
SongFerngWang
aa941c91b7 [Testing] To migration DefaultSubscriptionControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Create new class and add a function which loads the Settings Resource.
5. remove getOnPreferenceChangeListener. Becasue the error:
java.lang.NoSuchMethodError: No virtual method getOnPreferenceChangeListener()

Bug: 173004787
Test: atest -c DefaultSubscriptionControllerTest
Change-Id: Iac9834f2a47bd8b50234646197a31058ffacaa4b
2020-11-12 16:02:17 +08:00
Jeremy Goldman
f7d302c935 Underlying telephony library interface changed, updating tests
accordingly.

Test: atest -c CdmaSystemSelectPreferenceControllerTest
Change-Id: I6bbcf2422b1f87cc50ba8554fdc9e59b4b1bb0ba
2020-11-12 07:16:58 +00:00
Weng Su
c95baa2317 Fix the bug of losing Wi-Fi certificate when editing
- When the saved certificate is loaded into the UI, the EAP method
spanner will trigger a redundant item selection event to refresh the
certificate to the default value.

- Filter out redundant item selection event of the EAP method spanner.

Bug: 161569880
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=WifiConfigController2Test
Change-Id: I947fb7668ffa7e9ed8c150fe14e6ae9d7a67393c
2020-11-12 04:05:34 +00:00
SongFerngWang
216b346438 [Testcase] To migration DisabledSubscriptionControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
   to get context
3. Change Copy Right
4. remove the mock of PreferenceScreen

Bug: 173003522
Test: atest DisabledSubscriptionControllerTest.java
Change-Id: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
2020-11-12 11:10:20 +08:00
Sarah Chin
3318cc3bb2 Merge "Update ICC lock API methods" 2020-11-11 22:37:33 +00:00
Tobias Thierer
246f1fbc90 Merge "Fix malformed OWNERS." am: b460d47489 am: 7a8b3a140e am: dfba9408c0 am: 8977bd2b81
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947

Change-Id: I437a81f4fda887fd89cf22b1b16cb8d942f0275e
2020-11-11 22:26:26 +00:00