Commit Graph

2345 Commits

Author SHA1 Message Date
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Weng Su
9dfbd9dab8 Remove Wi-Fi toggle in settings search
- Remove Wi-Fi toggle preferences in settings search if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment29

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

Change-Id: Ibe352f3ec3413fb0774de0b2bd213bb705e919e0
2022-05-04 04:01:47 +08:00
Bonian Chen
b0706b2c60 Merge "[Settings] Fix missing part for refactor" into tm-dev am: e83d2a5e0e am: 63686f0534
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18123662

Change-Id: Ibf3a2ec14d8beffaabdfbd294b2436557f13083e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:43:14 +00:00
Bonian Chen
5ed53072da Merge "[Settings] Preferred network mode appears during in-call" into tm-dev am: 55d722c2b0 am: f34bb7a6e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18121902

Change-Id: I023a36f161993be3466c955c807c7d60e79c0a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 13:41:49 +00:00
Bonian Chen
e83d2a5e0e Merge "[Settings] Fix missing part for refactor" into tm-dev 2022-05-03 12:33:36 +00:00
Bonian Chen
55d722c2b0 Merge "[Settings] Preferred network mode appears during in-call" into tm-dev 2022-05-03 09:46:47 +00:00
Bonian Chen
03ea151c6a Merge "[Settings] Stop listening data connected intent for presenting reset APN dialog" into tm-dev am: 337cfe6fc0 am: 85a7283c06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090786

Change-Id: I00ca8556fb3e1b1281cf5d6ec74766a19bd7d54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:18:09 +00:00
Bonian Chen
eff476375c [Settings] Fix missing part for refactor
There're 2 missing parts in previous code refactor:
1. The API change for exiting ECM mode dialog
2. The support of onActivityResult() for PreferenceController

Bug: 226494641
Test: local
Change-Id: I0c2c313a53fbc1b7435f295f190b70653e2f6758
2022-05-03 07:33:48 +00:00
Bonian Chen
382d27f9c7 [Settings] Preferred network mode appears during in-call
Preferred networko mode should only presented when allowed.

Bug: 225291570
Test: local
Change-Id: I22edf0f6176a5bd3de12604895d9b14c3b015795
2022-05-02 20:19:02 +08:00
Bonian Chen
7c0241deb5 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: fd374c4dc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I523ca044e039ca78005504c00291d2eea1fe6e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:32:25 +00:00
Bonian Chen
ec3264f831 [Settings] Stop listening data connected intent for presenting reset APN dialog
Suspening the monitering of intent(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)
during the stage of resetting default APN, since its more like a noice
once the reset progress stared (since user pressed the menu button).

Bug: 190127964
Test: local
Change-Id: I524fb4a3b06b50706556b8e68cb36dc5efbd9a07
2022-05-01 15:28:42 +08:00
Bonian Chen
2acd62e9c9 Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev am: 783314ae4f am: 99de1117bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950991

Change-Id: I6b75daebf7e38c9be53d92860e4f3b0cbc2ed225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 19:00:09 +00:00
Bonian Chen
7bdf717410 Merge "[Settings] Rename title of SIM UI when changed" into tm-dev 2022-04-29 15:59:32 +00:00
Bonian Chen
ba943c9b94 [Settings] Rename title of SIM UI when changed
Title of subscription page should align with the SIM card.

Bug: 230308627
Test: local
Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228
2022-04-29 09:10:47 +00:00
Bonian Chen
783314ae4f Merge "[Settings] Link to incorrect SIM after SIM swap" into tm-dev 2022-04-28 11:05:42 +00:00
Bonian Chen
b92156c03e Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev 2022-04-27 15:57:30 +00:00
TreeHugger Robot
c28169adb9 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev 2022-04-27 05:56:10 +00:00
Bonian Chen
8789731cde Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"
This reverts commit 81d230b250.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
2022-04-27 05:13:30 +00:00
Bonian Chen
4e32727c01 [Settings] Link to incorrect SIM after SIM swap
A click to the UI presented on screen should take user to the exact SIM
that clicked instead of the first SIM presented to the end user (and
could no longer available).

Bug: 227273792
Test: local
Change-Id: If5a33f72e5730911af61f20a6a45a40cafb956d0
2022-04-27 08:55:45 +08:00
Bonian Chen
3bddc056d8 Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"
This reverts commit aeac0619df.

Reason for revert: merge failure in other branches

Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2022-04-27 00:03:20 +00:00
Bonian Chen
73c8e2f45a Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev 2022-04-26 10:25:31 +00:00
Bonian Chen
3fc05a917e Merge "[Settings] Code refactor for combining TelephonyCallback with Lifecycle" into tm-dev 2022-04-26 10:25:02 +00:00
SongFerng Wang
0064079c53 Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev am: 1bc142776c am: 33887c1233
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17904395

Change-Id: I937cb30ac6c2fed7b2d7dcee0afbeaf63fc78a42
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 08:30:25 +00:00
SongFerng Wang
1bc142776c Merge "[MEP] show the DSDS mode selection dialog for user when user insert esim" into tm-dev 2022-04-26 07:36:28 +00:00
SongFerngWang
e5fff060a2 [MEP] show the DSDS mode selection dialog for user when user insert esim
If device has esim, then user inserts esim in SS mode. Then, UI should show
the DSDS mode selection dialog for user.

Bug: 230050990
Test: build pass and manual test.
Change-Id: Ia4e695ae2c4e86d6039e03738378989a0879cc71
2022-04-25 21:07:26 +08:00
SongFerng Wang
87a5e19b64 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: a7a5061f08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I65b36d6e24bb218870f27dd887b316b2d52857f1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:13:13 +00:00
SongFerng Wang
564c88485a Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev 2022-04-25 07:40:43 +00:00
SongFerngWang
b76feffe4f Gray out the network mode UI before the carrier config is ready
Bug: 202167671
Test: atest EnabledNetworkModePreferenceControllerTest
Change-Id: Ib502ac19ea2c19dae95025302dd82aa2b1c7ff88
2022-04-22 19:28:13 +08:00
Bonian Chen
2615ee4097 Merge "[Settings] Code refactor for monitoring service state" 2022-04-22 10:50:47 +00:00
Bonian Chen
aeac0619df [Settings] Code refactor for combining TelephonyCallback with Lifecycle
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
(cherry picked from commit 7c5259efad)
2022-04-22 10:39:04 +00:00
Bonian Chen
6a2479e7d1 Merge "[Settings] Code refactor for monitoring voice call status" 2022-04-22 09:37:08 +00:00
Bonian Chen
e7de4a415d [Settings] Code refactor for monitoring service state
This is for monitoring the status of service state when Lifecycle state
STARTED or RESUMED.

Bug: 229689535
Test: unit test
Change-Id: If6bac5c04caae67d6293c5a69e3130789e9e588e
2022-04-22 13:54:54 +08:00
TreeHugger Robot
49cc66afd3 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev 2022-04-22 05:50:05 +00:00
Bonian Chen
887ec6c32c [Settings] Code refactor for monitoring voice call status
This is for monitoring the status of voice call when Lifecycle state
STARTED or RESUMED.

Bug: 229689535
Test: unit test
Change-Id: Ifa3e0c5aa474a2539ad66338ea8c3564ea33744e
2022-04-21 11:13:48 +08:00
Bonian Chen
7c5259efad [Settings] Code refactor for combining TelephonyCallback with Lifecycle
This is a helper class which may support monitoring the
TelephonyCallback under the condition of Lifecycle state STARTED or
RESUMED.

Bug: 229689535
Test: unit test
Change-Id: I6d26bee604d9559e207e107b2f26583f700f8e0a
2022-04-21 11:04:44 +08:00
Bonian Chen
81d230b250 [Settings] Code refactor for BroadcastReceiver under Lifecycle
This is an implementation of BroadcastReceiver which supported by
LifecycleCallbackConverter.
Registration of BroadcastReceiver only take place when Lifecycle in
RESUME status.

Bug: 229689535
Test: unit test
Change-Id: Ia2af82d5cbb391034627e5259a9e0c8683a0c5a1
(cherry picked from commit c2030898ef)
2022-04-20 16:54:41 +00:00
Bonian Chen
ee0756f684 Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" 2022-04-20 16:54:04 +00:00
Bonian Chen
3856ac4be9 [Settings] Code refactor for async Lifecycle listening
This is an extension of LifecycleCallbackAdapter.
A postResult(T) and a Consumer<T> is designed for supporting pass result
back to UI thread, and is invoked only when required.

Bug: 229689535
Test: unit test
Change-Id: I0ef5afc31cd23aa865a2dd1d05f9b212242c2e41
(cherry picked from commit 5d2a76cbb4)
2022-04-20 12:47:39 +00:00
Bonian Chen
37a326bd3e [Settings] Code refactor for Lifecycle listening
This is an abstract class for building a set of callback behavior
based on Lifecycle status change.

Through extending this class, the implemented methods are invoked
only when required.

Bug: 229689535
Test: unit test
Change-Id: I7534393546f821738a63ebde121a5a88ee03b23b
(cherry picked from commit 9a4c66d23b)
2022-04-20 12:46:26 +00:00
Bonian Chen
5d2a76cbb4 [Settings] Code refactor for async Lifecycle listening
This is an extension of LifecycleCallbackAdapter.
A postResult(T) and a Consumer<T> is designed for supporting pass result
back to UI thread, and is invoked only when required.

Bug: 229689535
Test: unit test
Change-Id: I0ef5afc31cd23aa865a2dd1d05f9b212242c2e41
2022-04-20 16:45:08 +08:00
Bonian Chen
c2030898ef [Settings] Code refactor for BroadcastReceiver under Lifecycle
This is an implementation of BroadcastReceiver which supported by
LifecycleCallbackConverter.
Registration of BroadcastReceiver only take place when Lifecycle in
RESUME status.

Bug: 229689535
Test: unit test
Change-Id: Ia2af82d5cbb391034627e5259a9e0c8683a0c5a1
2022-04-19 23:25:14 +08:00
Bonian Chen
9a4c66d23b [Settings] Code refactor for Lifecycle listening
This is an abstract class for building a set of callback behavior
based on Lifecycle status change.

Through extending this class, the implemented methods are invoked
only when required.

Bug: 229689535
Test: unit test
Change-Id: I7534393546f821738a63ebde121a5a88ee03b23b
2022-04-19 15:12:59 +08:00
Xiao Ma
f59510a5ee Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3 am: a8ff1f723c am: d60998396a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: I2e9854b47e7081eb2f0340f695d746fb80caf8a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 01:57:11 +00:00
Xiao Ma
a8ff1f723c Merge "Remove the legacy config_ethernet_iface_regex from Settings." am: 73d83b69d3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2052707

Change-Id: I9aaf20d105029e379dc8c6c28b3c88d4a75e7424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 01:11:22 +00:00
Stanley Wang
75a349c1b8 Add the title of the SettingsMainSwitchPreference in the
mobile_network_settings.xml to avoid the preference can not
be indexed.

Fix: 222021677
Test: manually test and review the UI
Change-Id: I53b1637e845489bc1df2e7b4216c56400fd28659
2022-04-13 19:36:36 +08:00
Xiao Ma
ce9b4447c4 Remove the legacy config_ethernet_iface_regex from Settings.
Bug: 214348333
Test: m Settings
Test: manually verify that device can access the Internet via Ethernet
Test: manually verify that device can share the Internet via Ethernet
      tethering
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherEnablerTest
Change-Id: I822ff60ee8be63ff0c518d2972ad8b30dfacadcd
2022-04-13 18:37:26 +09:00
Bonian Chen
5839607867 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev 2022-04-08 08:16:34 +00:00
Weng Su
22c8bf81e1 Restrict Wi-Fi toggle in Internet Settings
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.

- Show restriction message in Wi-Fi toggle summary.

- See the result screenshot in b/203168097#comment24

Bug: 203168097
Test: manual test
atest -c WifiSwitchPreferenceControllerTest

Change-Id: I3cfe2f4f0e855dde91a82babe3a03005c3985d59
2022-04-07 12:06:13 +08:00
Xin Li
e75d9ee3e9 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I50e3649c21bb83ee9130fa98a71560fe261198a9
Change-Id: I2a97159d0de32a6262bbace7bb82b09897447bdb
2022-04-01 20:32:46 +00:00
Treehugger Robot
973031b290 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: I3e34f4f6ef32064e7de1ca0a9aee94c02f94e7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 07:49:23 +00:00