Commit Graph

77861 Commits

Author SHA1 Message Date
TreeHugger Robot
2cc6f6cdce Merge "Sync main branch with QPR branch changes" 2020-11-13 21:07:05 +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
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
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
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
Tobias Thierer
8977bd2b81 Merge "Fix malformed OWNERS." am: b460d47489 am: 7a8b3a140e am: dfba9408c0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947

Change-Id: Ic61d1bb175b1ba46b7df308af36e76b596a9b61e
2020-11-11 22:01:46 +00:00
Tobias Thierer
dfba9408c0 Merge "Fix malformed OWNERS." am: b460d47489 am: 7a8b3a140e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947

Change-Id: I7505d04a6714d3829728e136b3fe9682d741461c
2020-11-11 21:42:11 +00:00
Tobias Thierer
7a8b3a140e Merge "Fix malformed OWNERS." am: b460d47489
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947

Change-Id: I7d6c0fa35036ac7d0ac130c0b96fbb181f29aa9d
2020-11-11 21:06:20 +00:00
Tobias Thierer
b460d47489 Merge "Fix malformed OWNERS." 2020-11-11 20:46:05 +00:00
Tobias Thierer
6b3df1be9e Fix malformed OWNERS.
Per go/android-owners, include directions should be of the form
[gerrit_project_name]:[absolute_path_to_included_file].

Exempt-From-Owner-Approval: Only editing OWNERS file that ought
to be owned by ourselves, anyway.

Bug: 159055442
Test: Treehugger
Change-Id: I9130985b484349264f1fc42c320e93b2bc672a59
2020-11-11 20:45:53 +00:00
Julia Reynolds
6e5c296bf4 Fix contact name issue
Contacts don't have to have a display name

Test: manual
Fixes: 172903141
Change-Id: Iabbde4c5f527128c960334997910dba4536fe055
2020-11-11 13:18:41 -05:00
Bonian Chen
d2e22f4cee [Settings] Reduce the operation of VoLTE config redraw
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Change-Id: I56d4900b5bcb189693c99e870b013da97ed283db
2020-11-11 09:43:50 +00:00
Bonian Chen
296a4bc62e Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" 2020-11-11 07:12:27 +00:00
Weng Su
597158ce90 [Provider Model] Remove “Use Wi-Fi” switch
- Screenshot
  https://screenshot.googleplex.com/3Kv7JUqJkDuvGGr

Bug: 172788136
Test: manual test
Change-Id: Ie5c522d479b2dedde46ec61b73a41b716e2e119d
2020-11-11 07:03:30 +00:00
Kevin Chyn
0c9209798f Merge "Make biometric PendingIntent immutable" 2020-11-11 05:42:32 +00:00
Bill Yi
f0385b0e20 Merge "Import translations. DO NOT MERGE" 2020-11-11 03:58:58 +00:00
Bill Yi
5e7323c99c Merge "Import translations. DO NOT MERGE" 2020-11-11 03:58:52 +00:00
Kevin Chyn
5b2cd89abd Make biometric PendingIntent immutable
Fixes: 172207250
Test: Builds
Change-Id: I75688873ca74408c70559ca9ec3717a38bba0f60
2020-11-10 18:15:43 -08:00
Bill Yi
d355a8c021 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I7d046946d28495286637b7cc15e7cb1afbd43dcf
2020-11-10 19:47:16 +00:00
Bill Yi
360db81c80 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ia67d6966e879ac5e8824d9821dbff27ce78eb383
2020-11-10 19:13:26 +00:00
Sarah Chin
92dfa7b2ef Fix CDMA roaming and subscription mode tests
ag/12960261 fixed the robotests but not the unit tests

Test: atest
Fix: 172900794
Change-Id: I871c93f46da3df4b544f2267a15c930cb679901e
2020-11-10 10:59:59 -08:00
Biswarup Pal
26bf130bc6 Merge "Add Transcode Settings screen in Developer Options" 2020-11-10 16:04:30 +00:00
Neil Fuller
bd8a318e88 Merge "Move the Location time zone detection setting" 2020-11-10 12:22:18 +00:00
Ryan Lin
58d8cff28b Merge "Provide a way to Magnification settings via intent" 2020-11-10 11:22:03 +00:00