Commit Graph

1158 Commits

Author SHA1 Message Date
Bonian Chen
a239a6c53a [Settings] Hide subscriptions not existed within device
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.

Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.

Note: subscriptions with same group UUID will be displayed seperately.

Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
(cherry picked from commit 75f1450bbf)
(cherry picked from commit 0726f263a8)
2021-07-12 17:32:59 +08:00
Bonian Chen
5d57ed1d51 Merge "[Settings] Rollback group UUID merging in SIM settings" 2021-07-12 08:45:58 +00:00
Bonian Chen
0726f263a8 [Settings] Rollback group UUID merging in SIM settings
Within origin design, subscriptions with same group UUID
are not merged together.

This is a fix which changing grouping by UUID part into a configurable
option which allows to be enabled in some other conditions.

Bug: 191228344
Test: local
Change-Id: I0101f4a51ec2342f059762f0e7d38bb4e93554cf
2021-07-12 14:59:28 +08:00
SongFerng Wang
2950401a1c Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e am: 0309aad720
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I48de91db9d09c743421339c3ccaeafbacd742e71
2021-07-08 09:07:56 +00:00
SongFerng Wang
9f06b36b3b Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I1dfb9507da126f8e25ba12535581d40801837d89
2021-07-08 08:30:06 +00:00
SongFerng Wang
a73d199d5e Merge "Network selection add NGRAN when device support SA" into sc-dev 2021-07-08 08:17:19 +00:00
Bonian Chen
a229b29737 Merge "[Settings] Settings within each SIM not been displayed to the user" 2021-07-07 09:03:45 +00:00
SongFerngWang
193f97c7ba Network selection add NGRAN when device support SA
Bug: 187148937
Test: build pass.
atest NetworkScanHelperTest (pass)

Change-Id: I1ed3eae3bda39eb702bc135b0c698f8df7c280d7
2021-07-07 15:36:42 +08:00
Bonian Chen
8e3ff612d2 Merge "[Settings] Hide subscriptions not existed within device" 2021-07-07 07:03:10 +00:00
Bonian Chen
75f1450bbf [Settings] Hide subscriptions not existed within device
For non-active subscriptions, the one inserted in slot
but turned off need to be visible to the user. However,
the one un-plugged need to be invisble.

Since SubscriptionUtil#getSelectableSubscriptionInfoList() didn't cover all the cases required. Create this one to fit into the criteria required here.

Bug: 191228344
Test: local
Change-Id: Ia68c23b007164b7520456cb6c7427ca142558b59
2021-07-07 07:02:55 +00:00
Treehugger Robot
5dfa9cde19 Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87 am: 4909b81006 am: b6e44d16ac am: 957ece6934
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952

Change-Id: I159684580a0f018e7d41dc2982c7d7001e88cf55
2021-07-06 09:15:20 +00:00
Treehugger Robot
b6e44d16ac Merge "Add a developer option to increase nfc stack log level" am: 9d7b0beb87 am: 4909b81006
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1733952

Change-Id: I257c6806afcef6211eedc8cf60829f90930a0d32
2021-07-06 08:52:25 +00:00
Bonian Chen
76bf6ff525 [Settings] Settings within each SIM not been displayed to the user
The display of content is in majority depending on the callback result
of SIM card (in order to display the content).

However, to reduce the number of access of SubscriptionManager and
improve performance, a proxy has been design in between to reduce the
traffic and the latency required.

Within this situation, content didn't get displayed when Activity get
restarted since Proxy avoid to reduce the traffic through reducing the
callback to the Activity and even not generating request for update when
Activity resume.

Bug: 188982508
Test: local & unit test
Change-Id: Ia3b946a853f87a469ce07a398f3811f605d38f1d
2021-07-05 15:12:39 +08:00
TreeHugger Robot
25854227de Merge "Password settings: Fix work profile" into sc-dev am: e6cff5497d am: e77a10c6e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153211

Change-Id: Id6ccd62924cc433f9eddb1ba3a2e70a74a6c29c1
2021-07-02 09:07:51 +00:00
TreeHugger Robot
e6cff5497d Merge "Password settings: Fix work profile" into sc-dev 2021-07-02 08:42:26 +00:00
Jeremy Goldman
53dc808764 Merge "ManageablePreferenceTest created for VpnSettings" 2021-07-02 07:20:02 +00:00
Yanting Yang
b7f21e9723 Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd am: 4e4cae07b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993

Change-Id: I56c9d4c8a80006e2a1186a1a573c3acd669e2b4e
2021-07-02 04:18:17 +00:00
Jeremy Goldman
cfb194d605 ManageablePreferenceTest created for VpnSettings
Creating unit tests for VPN settings to increase the reliability of that
settings component.

Note that because S build is locked down but the T sdk has not been
started, the test suite was seeing the following error:

java.lang.IllegalArgumentException: Error: Failed to parse APK file: /data/local/tmp/SettingsUnitTests.apk: Requires development platform T but this is a release platform

In order to resolve this error, specifically set the SDK as android
S in the manifest. When the SDK transitions to android T, this may need
to be updated.

Test: atest -c tests/unit/src/com/android/settings/vpn2/ManageablePreferenceTest.java
Bug: 187245804
Change-Id: Ifa1450c23b1ade46809541252e22950b76b4faa5
2021-07-02 09:47:28 +08:00
Yanting Yang
007d1b2a57 Remove stale search result about "Recent location requests" page
Based on the new design, RecentLocationRequestSeeAllFragment was no
longer used on Location, but it still implemented the indexable
interface to provide stale search result “Recent location requests”
to Settings Search.

Remove the indexable interface from RecentLocationRequestSeeAllFragment
as a quick fix and also correct the related test method name.

Fixes: 192542283
Test: visual
Change-Id: I1a3df5d7319b8831db2f3d3abba19a11b5a83c81
2021-07-01 20:31:05 +08:00
Ahaan Ugale
d4ce558f33 Password settings: Fix work profile
Currently, the work profile password settings just point to the personal
profile app. This change fixes this using the forWork metadata tag, that
sets the work profile user in BasePreferenceController.

Also fixes and re-enables the
displayPreference_withPasswords_addsPreference test.

Fix: 192417100
Test: manual - work profile link works, password count is accurate
Test: atest PasswordsPreferenceControllerTest
Change-Id: I6345b69b9c03ff13b8e2784e69dc0188abc436e3
2021-06-30 17:22:07 -07:00
TreeHugger Robot
2171d72c0d Merge "[Settings] Pass the system user to launch the web help page" into sc-dev am: b36bbc55d1 am: aa3e4f7348
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15105946

Change-Id: I710c1878e60bf6f0fb09888752e5d9b033849cfe
2021-06-29 19:25:31 +00:00
TreeHugger Robot
b36bbc55d1 Merge "[Settings] Pass the system user to launch the web help page" into sc-dev 2021-06-29 18:55:24 +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
80fd8a7cce Merge "[Provider Model] Hide Connectivity Subsystems when recovering" into sc-dev 2021-06-29 13:11:14 +00:00
arangelov
8fca8dc092 [Settings] Pass the system user to launch the web help page
Fixes: 191727929
Test: manually observed the policy transparency dialog
with launching the admin policies screen
Test: manually observed the policy transparency dialog
with launching the web help page

Change-Id: If0d10b30a5e5f2a1bade168f049c8613055289e7
2021-06-28 20:14:16 +01: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
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
Jeremy Goldman
3444ee6e0b Merge "LegacyVpnPreferenceTest added for Vpn settings" 2021-06-28 04:13:38 +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
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
Jeremy Goldman
e212e16d41 Merge "AppPreferenceTest created for VpnSettings" 2021-06-25 08:06:44 +00:00
Bonian Chen
5422f8aac8 Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" 2021-06-25 05:13:56 +00:00
Jeremy Goldman
9e51e4cb76 AppPreferenceTest created for VpnSettings
This sets up the unit test and checks the basic functionality of the
3rd party vpn preference.

Test: atest -c AppPreferenceTest
Bug: 187245804
Change-Id: I3037db27711fd5c2bbc8421e0827dcfa58ab21e8
2021-06-25 13:08:19 +08: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
74597578ca LegacyVpnPreferenceTest added for Vpn settings
Ensure that the profile name is successfully stored, and that the title
of the preference corresponds to the name of the associated VpnProfile

Interesting issue occurred where the icon resource was not present the
first time the class was initialized, but not the second. Trying this
twice within the test resolved this issue.

Test: atest -c LegacyVpnPreferenceTest
Bug: 187245804
Change-Id: I325b155cb0afdb6ce134325944fe5651bf9a1233
2021-06-25 09:21:03 +08:00
TreeHugger Robot
8f11a6799f Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 4cbdf9d17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I20c21a9f47793f371c23cd76dbe8402e8e5ac4f5
2021-06-23 16:03:44 +00:00
Weng Su
9395d39063 [Provider Model] Remove Wi-Fi switch menu in internet panel
- Remove "Turn on/off Wi-Fi" menu in internet panel

- Don't show the default "See more" menu in internet panel also.

Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest

Change-Id: I3a9927e356e0f7e534b1e2ba848d2b6d2a5bd858
2021-06-23 12:47:06 +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
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
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
ae2793958d Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c am: ed23563724
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681

Change-Id: I28e9ef93d74c6063545fac0b6be940f4991d61e8
2021-06-22 13:05:19 +00:00