Commit Graph

1808 Commits

Author SHA1 Message Date
TreeHugger Robot
555f390b69 Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev am: a375349c0a am: a1743644bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15135719

Change-Id: Idbee65ea3b5e20e1ac743e7dcf6c40b2c9fcc645
2021-06-29 13:39:28 +00:00
TreeHugger Robot
1d69f1c0e1 Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev am: 80fd8a7cce am: 2a56929f62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124033

Change-Id: I4e76656f5cfefe4dca6a432929e9c8ac756c34db
2021-06-29 13:39:21 +00:00
TreeHugger Robot
a375349c0a Merge "[Provider Model] Fix the "Cancel" button issue in the reminder dialog" into sc-dev 2021-06-29 13:13:04 +00:00
TreeHugger Robot
80fd8a7cce Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev 2021-06-29 13:11:14 +00:00
Weng Su
d2fb4f06a3 [Provider Model] Fix the "Cancel" button issue in the reminder dialog
- Do nothing if user cancel to turn off mobile data

Bug: 192052695
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ib4b990a1f3f51a6bf11552a6018c73f8d7105736
2021-06-29 16:08:20 +08:00
Bonian Chen
d9bf670725 Revert "[Settings] Code Refactor - ActiveSubscip..."
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).

It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).

Reason for revert: Try to submit all of the modifications within single submit as a workaround.

Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
2021-06-28 09:32:54 +00:00
Weng Su
7a45b33c42 [Provider Model] Hide Connectivity Subsystems when recovering
- Hide Carrier Network

- Hide Wi-Fi toggle

- Hide all of Wi-Fi Networks

Bug: 186590805
Test: manual test
atest InternetResetHelperTest
atest NetworkMobileProviderControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ib8462f890847d14bfc6ef533d1147822fd797a13
2021-06-28 17:19:13 +08:00
Bonian Chen
4c4d8e3a08 Revert "[Settings] Fix build breakage"
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener

Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage

Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
2021-06-28 05:23:33 +00:00
Bonian Chen
63405687b7 Merge "[Settings] fix for Wifi calling settings page crash" 2021-06-28 04:20:26 +00:00
Bonian Chen
c437177d4b Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev 2021-06-28 03:59:43 +00:00
Bonian Chen
fbe1293a54 [Settings] fix for Wifi calling settings page crash
UI crash reported due to accessing telephony framework API with invalid
subscription ID from SIM. Which comes with multiple reason.

Besides of avoidance of crash, following updates are also required:
1. Close wifi calling settings UI when pSIM or eSIM not available or
inserted.
2. Keep the selection of tab (under multi-SIM) when screen rotate
3. Only show 1 SIM when multi-SIM are grouped together

Bug: 149190278
Test: local
Change-Id: Ied9a088b6ee5da66972f27649cc07f4a31304f17
2021-06-27 14:11:54 +08:00
Bonian Chen
ea951aab42 Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""
This reverts commit 7b8e05adab.

Reason for revert: add missing file back to CL

Bug: 191321218
Test: build pass
Change-Id: I9ae819f06b2b6f042c2f39a8ff76c025ba49f631
2021-06-25 08:47:21 +00:00
Bonian Chen
4a6733e456 [Settings] Fix build breakage
There's a missing file within ag/15076791.
ag/15102531 is a revert for ag/15076791.

Right now, ag/15106410 is a revert for revert (ag/15102531).
And this is a CL adding the missing file back.

Bug: 191321218
Test: build pass
Merged-In: I7282c7ba9fbb793056c12928843b6eef59eb2213
Change-Id: I15819472b37a3bdba25fe006246baa968680a19f
2021-06-25 16:38:27 +08:00
Bonian Chen
5422f8aac8 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" 2021-06-25 05:13:56 +00:00
Bonian Chen
58b9fac2e9 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: e8bb21dde2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531

Change-Id: Idba44549100166ea8118f61d5cbd3a935cc9959a
2021-06-25 02:27:44 +00:00
Bonian Chen
69b052a2e3 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb am: 49e4eb1151
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791

Change-Id: I2b8370c7b7bab117251269df256eee966153f42d
2021-06-25 02:27:38 +00:00
Bonian Chen
f9aa12f4d9 Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev 2021-06-25 02:17:59 +00:00
Bonian Chen
7b8e05adab Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"
This reverts commit 2a1344a50e.

Reason for revert: Missing some files which would lead to build breakage.

Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev 2021-06-25 01:59:05 +00:00
Jeremy Goldman
8c59edaa01 Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff6942c am: 9bb3fd99d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007770

Change-Id: I2198b0c121a8d79abd25634df439195ef3bd61d9
2021-06-24 01:08:12 +00:00
Jeremy Goldman
7a6ff6942c Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev 2021-06-24 00:40:46 +00:00
TreeHugger Robot
37fada87a3 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: bffc06f40d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I8d7e2612ce6f82917f0005c62e1e8de6a96550d2
2021-06-23 10:47:44 +00:00
TreeHugger Robot
33b8710479 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: c4501805c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I0f21062b2df8ea153601bba68338dbf5459b03e8
2021-06-23 10:47:39 +00:00
TreeHugger Robot
1777344309 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: a4b5ecc5f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ic674efa0599fb80487d1af4bfcd0c8030092365a
2021-06-23 10:47:33 +00:00
TreeHugger Robot
b86f0c0472 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev 2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev 2021-06-23 10:11:33 +00:00
TreeHugger Robot
74babf6e91 Merge "Fix the NPE issue" into sc-dev 2021-06-23 10:10:22 +00:00
Weng Su
362bf07919 [Provider Model] Add Wi-Fi toggle in internet panel
- Add a new slice row for Wi-Fi toggle in the network lists

- Increase the maximum number of network lists to 6

Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2 [Provider Model] Show carrier network to internet preference
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
2021-06-23 15:55:24 +08:00
Bonian Chen
2a1344a50e [Settings] Code Refactor - ActiveSubsciptionsListener
Fix the spelling with "ActiveSubsciptionsListener" into "ActiveSubscriptionsListener".

Bug: 191321218
Test: build pass
Change-Id: I7282c7ba9fbb793056c12928843b6eef59eb2213
2021-06-23 07:34:00 +00:00
TreeHugger Robot
93393e0267 Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: f791f3b988
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: I445b0816cb297e894c8504c735932b9f5ed88b17
2021-06-23 06:34:49 +00:00
TreeHugger Robot
60b63d549a Merge "Fix missing share context option in settings app" into sc-dev 2021-06-23 03:47:39 +00:00
Quang Luong
82934c57e7 Merge "Add WifiTrackerLib as separate dependency from SettingsLib" 2021-06-22 16:47:56 +00:00
Weng Su
ebcfa17353 Fix the NPE issue
Bug: 190938633
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I249d701abfa79872a331c071116d2db0bfdcced6
2021-06-22 18:20:55 +08:00
TreeHugger Robot
216aa028d2 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 19fa17e3b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I5b8a319b15e3e7ff487b3460799ac94764e25878
2021-06-21 10:33:43 +00:00
TreeHugger Robot
dbaad0436d Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev 2021-06-21 10:00:14 +00:00
Yi-Ling Chuang
c55b2cef2a Revert "Suppress Shared Axis transition on the SIM dialog"
This reverts commit 5e8a3947d2.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I0d4756797914ac5bcb37dde31e80dc4cd45fcd6b
2021-06-21 09:32:01 +00:00
SongFerng Wang
90602b73d1 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f am: 001395533a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I698df31c58cf3e545b53a48da5225dd2bc703925
2021-06-18 09:59:07 +00:00
SongFerng Wang
001395533a Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev am: 7e4b664df0 am: efcce7f70f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001650

Change-Id: I53b5181da7fb682b00ad628b5df0b4e71d13a64f
2021-06-18 09:49:55 +00:00
SongFerng Wang
7e4b664df0 Merge "Add the confirmation dialog when user disable mobile data at first time" into sc-dev 2021-06-18 09:38:18 +00:00
TreeHugger Robot
e88381162e Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe am: 159b877d6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I5585363db06ccec977ed479f6351567280c82532
2021-06-18 08:26:52 +00:00
TreeHugger Robot
56be44e4b9 Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev am: 0781c52dfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016144

Change-Id: I102131cb18a9538c5ee5e17deda7336f899af1f3
2021-06-18 08:18:15 +00:00
TreeHugger Robot
0781c52dfe Merge "Add a loading progress timeout mechanism to Internet Settings" into sc-dev 2021-06-18 08:08:19 +00:00
SongFerngWang
c9a9faf5b8 Add the confirmation dialog when user disable mobile data at first time
Bug: 189983549
Test: atest ProviderModelSliceTest
Change-Id: I83fcadb07e4f8dff5d07bc4015c0c6004c4f5de5
2021-06-18 15:58:58 +08:00
Weng Su
98cf86b367 Add a loading progress timeout mechanism to Internet Settings
- The WiFi scan results may not be called back, need to add loading
progress timeout to avoid loading forever

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

Change-Id: I71071e7e68007cf7e16be46230eec3b01f4d2b45
2021-06-18 13:43:14 +08:00
Tom Hsu
41224eed14 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43 am: fb7cc99138
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: I3c10378f9be267fd33081c49c6c40c78dff24cb9
2021-06-17 11:51:04 +00:00
Tom Hsu
d332493def Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880

Change-Id: If5720ff1bd460f7a311a5c87d0366282a51cf8fc
2021-06-17 11:33:21 +00:00
Tom Hsu
0279a99e43 Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev 2021-06-17 11:23:12 +00:00
tom hsu
a2402aba83 [Settings] Prevent crash from abnormal behavior.
- The problem is user remove SIM when stop in ApnSettings page, and do
 unexpected operation.

 - To figure out this problem, listen SIM absent event and make activity
 finish at this moment.

Bug: 189909956
Test: Manual test.
Change-Id: I179c708debcbc31ba9a93e4e434ae810051f5004
2021-06-17 07:28:53 +00:00