SongFerngWang
4ba7007aba
Add AirplaneModePreferenceControllerTest at Androidx.Test
...
Bug: 161875909
Test: atest AirplaneModePreferenceControllerTest (PASS)
Change-Id: Id1c50824fa420d958fcc45f80aba30a360c40b94
2020-08-13 17:32:13 +08:00
Bonian Chen
00e8b63d0f
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours am: 8eb932b5b1
-s ours
...
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I9aa4c9e5995037bfa5ad5ace90889d430993dd27
2020-08-13 09:25:07 +00:00
Arc Wang
aa935f2711
[automerger skipped] Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804
am: 8df77fd7a3
-s ours
...
am skip reason: Change-Id Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe with SHA-1 ae79c41cd7
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355969
Change-Id: Ie1c68c9cbfecfe21528ab70b8156aa90f7c54926
2020-08-13 09:23:50 +00:00
Bonian Chen
8eb932b5b1
[automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
am: 4fc5e348bf
-s ours
...
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: I22f62a4e0a0474cf9ead4d1ed38090b28bf0b243
2020-08-13 09:14:05 +00:00
Arc Wang
8df77fd7a3
Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355969
Change-Id: Ibe5882d260907654e8c8891a4e65fb73e9e39730
2020-08-13 09:06:17 +00:00
Jackal Guo
e8b8d9917a
Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396
Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1
2020-08-13 08:56:03 +00:00
Bonian Chen
4fc5e348bf
Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391
Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3
2020-08-13 08:55:56 +00:00
Jackal Guo
d7f05b5438
Merge "Revert "[Settings] Refactor PhoneStateListener""
2020-08-13 08:52:47 +00:00
Arc Wang
b6a9493804
Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev
2020-08-13 08:52:27 +00:00
Jackal Guo
765fb8293d
Revert "[Settings] Refactor PhoneStateListener"
...
This reverts commit e01df59027
.
Reason for revert: b/163995409 | Build failure.
Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
2020-08-13 08:48:31 +00:00
Bonian Chen
7903cf872e
Merge "[Settings] Refactor PhoneStateListener"
2020-08-13 08:13:25 +00:00
Bonian Chen
32a908cc69
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours am: bdd022172e
-s ours am: 5278ed8be1
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: I2170d3f7b7086c9bf6ef7692b43146f5cff31135
2020-08-13 05:38:42 +00:00
Bonian Chen
5278ed8be1
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours am: bdd022172e
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: I0d8fcdf66e7c9d664c75525cce723e4f83d15bc5
2020-08-13 05:28:58 +00:00
Bonian Chen
bdd022172e
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours am: ce259b61f6
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: Ibb972bf5b76ae57ff451fe2ee65d312fcf388956
2020-08-13 05:14:59 +00:00
Bonian Chen
e01df59027
[Settings] Refactor PhoneStateListener
...
Remove Looper and update of mSubId
Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
2020-08-13 13:02:04 +08:00
Bonian Chen
ce259b61f6
[automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
am: 5c21396034
-s ours
...
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: I219267b4f2b50f71acf7065aa58478d382472ddf
2020-08-13 04:57:28 +00:00
Bonian Chen
5c21396034
Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389
Change-Id: Ib8e712b0416e24857b1e2d1203cf22bd12ba4786
2020-08-13 04:43:30 +00:00
Bonian Chen
3b8794d16b
Merge "[Settings] Replace getSimCount() API"
2020-08-13 04:27:36 +00:00
Arc Wang
e86a292990
Merge "[Wi-Fi] Fix crash after editing invalid hotspot password"
2020-08-13 03:03:07 +00:00
Bonian Chen
5560882548
[Settings] Replace getSimCount() API
...
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().
Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Merged-In: I965a0c07c7c9ef5897b33809bae6a7921977db18
Change-Id: I8010f74c41826b081aa9f599d33a9519a1888215
2020-08-13 10:56:55 +08:00
Zhen Zhang
75028dd946
Update subtext of Ethernet Tethering preference
...
Update the subtext summary according to UX
Bug: 153761463
Test: built successfully; manually test
Change-Id: I96d1a1f5111f85ee4b10f61ab4408822b99032e1
2020-08-12 16:13:48 -07:00
Lucas Dupin
59d8ab1094
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
am: 01cb6c4a20
am: 7925b0c044
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I72ae494b522a44797d505e7c382bc6079af668cf
2020-08-12 22:25:06 +00:00
Lucas Dupin
1d663e72ce
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
am: 5f44b7cf54
am: 6430a4b88f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: Iac01c66216d6ab98654b97f33505d9f60714c78e
2020-08-12 22:24:45 +00:00
Lucas Dupin
7925b0c044
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
am: 01cb6c4a20
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I570f25117a12b55046dac45c086693e859e2cc6c
2020-08-12 22:08:40 +00:00
Lucas Dupin
6430a4b88f
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
am: 5f44b7cf54
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I7f2ae48cbdcad2fa44d96382b7d2c175b7605f59
2020-08-12 22:07:32 +00:00
Lucas Dupin
01cb6c4a20
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I4dae464e9f3c581d80a10d515934302c345ef336
2020-08-12 21:51:47 +00:00
Lucas Dupin
5f44b7cf54
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522
Change-Id: I607edce1f3981b4b8882bea1530362980a280de9
2020-08-12 21:50:32 +00:00
Lucas Dupin
e899f749a1
Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev
2020-08-12 21:27:45 +00:00
TreeHugger Robot
6af0342084
Merge "Display "see all" option when bluetooth is off"
2020-08-12 10:24:29 +00:00
Bonian Chen
440ba9e297
[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
am: 86320e5484
-s ours am: 8dfe7ea127
-s ours am: c120b09dcc
-s ours am: aa9a93d737
-s ours
...
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: Ie2df3fcf9208d4d4ee3a289f21d0f7885d3b31a6
2020-08-12 10:09:47 +00:00
Bonian Chen
aa9a93d737
[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
am: 86320e5484
-s ours am: 8dfe7ea127
-s ours am: c120b09dcc
-s ours
...
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I0a08fbdcea2b51d3427522a1773092205187d14e
2020-08-12 09:51:12 +00:00
Bonian Chen
c120b09dcc
[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
am: 86320e5484
-s ours am: 8dfe7ea127
-s ours
...
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I094d14db59d3bacd0dc84548034c6c4f6e6e20a5
2020-08-12 09:35:29 +00:00
Bonian Chen
8dfe7ea127
[automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
am: 86320e5484
-s ours
...
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I4320c9249fbbae470bb5b320cd9fde425a2c8828
2020-08-12 09:15:35 +00:00
Hugh Chen
bde100849e
Display "see all" option when bluetooth is off
...
- This CL before, Bluetooth settings will hide the "see all"
option when bluetooth is off. For the UX improvement, this
CL will show the "see all" button when bluetooth is off. And
turn on the BT when user press "see all" button to let user to
quick pair their disconnected devices.
- Update and add test case
Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
2020-08-12 17:07:33 +08:00
Bonian Chen
86320e5484
Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828
Change-Id: I8cec53b0c426cf73c470db0d763280d13435b257
2020-08-12 08:57:39 +00:00
Bonian Chen
6fe15deeb1
Merge "[Settings] Code refactor for Wifi calling IMS API"
2020-08-12 08:41:29 +00:00
TreeHugger Robot
6a128b486f
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-12 08:19:06 +00:00
TreeHugger Robot
0d11f25a77
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-12 08:00:06 +00:00
Treehugger Robot
0eb1091927
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
am: c855a8a21a
am: 455d7924c4
am: 43cff6baff
am: cc70bf2117
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: I03362cd0a041cac0d4d50a11f0938e7331c8f7a7
2020-08-12 07:16:30 +00:00
Treehugger Robot
cc70bf2117
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
am: c855a8a21a
am: 455d7924c4
am: 43cff6baff
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: I95587957bbfe79c37dd1246d3bec0a67201d217f
2020-08-12 07:02:12 +00:00
Treehugger Robot
43cff6baff
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
am: c855a8a21a
am: 455d7924c4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: I4721d6a74d655fca65f7a95ee996d3421581871e
2020-08-12 06:46:58 +00:00
Arc Wang
ae79c41cd7
[Wi-Fi] Fix crash after editing invalid hotspot password
...
From Android 11, Wi-Fi framework only supports ASCII encoding
for hotspot password, APP should check if password character is
valid.
This change checks if SoftApConfiguration accepts the password
and disable the OK button if the password is invalid.
Bug: 163353576
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiUtilsTest
Change-Id: Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe
2020-08-12 14:34:02 +08:00
Arc Wang
b432cf293c
[Wi-Fi] Fix crash after editing invalid hotspot password
...
From Android 11, Wi-Fi framework only supports ASCII encoding
for hotspot password, APP should check if password character is
valid.
This change checks if SoftApConfiguration accepts the password
and disable the OK button if the password is invalid.
Bug: 163353576
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiUtilsTest
Change-Id: Icf3b5c85856906e4cbe2f0ad79583c1b7182b8c7
Merged-In: Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe
2020-08-12 14:29:30 +08:00
Treehugger Robot
455d7924c4
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
am: c855a8a21a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: Ibdb29f86401439a66c9aa3a456454e6caadddffa
2020-08-12 06:26:47 +00:00
Treehugger Robot
c855a8a21a
Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660
Change-Id: I20645fd922e5908a8911fd7dc975f3ea4e053990
2020-08-12 06:10:58 +00:00
Treehugger Robot
5a19cea4ef
Merge "Prevent errors when updating operator pref summary"
2020-08-12 05:54:27 +00:00
Bonian Chen
91412b5069
[Settings] Code refactor for Wifi calling IMS API
...
Replacing logics of
ImsManager#isWfcEnabledByPlatform() &
MobileNetworkUtils#isWfcProvisionedOnDevice()
into WifiCallingQueryImsState#isWifiCallingProvisioned().
Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Merged-In: I68462368669b81e10d09bbb93e74e23ea9a1f446
Change-Id: I26d616f082a4dd3f2cb14defc5f68218f668ad48
2020-08-12 13:43:46 +08:00
Bonian Chen
42faeb8949
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours am: db8bd6ac06
-s ours am: 636d86d5eb
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: If565260efaf56506d6d23ada63390a9267eb35d1
2020-08-12 05:43:42 +00:00
Bonian Chen
636d86d5eb
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours am: db8bd6ac06
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: Iad8632321126718672589b5f7dcc91947579dd7d
2020-08-12 05:25:45 +00:00
Bonian Chen
db8bd6ac06
[automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3
am: 59dfd94170
-s ours am: 8c8761b74e
-s ours
...
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560
Change-Id: I2a0c58e8bca107541ae83985eba12f2b58ce4d59
2020-08-12 05:08:39 +00:00