Commit Graph

9078 Commits

Author SHA1 Message Date
Jayachandran Chinnakkannu
b5617b6f21 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am: 7afb9854a7

Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
2019-08-23 20:36:56 -07:00
Jayachandran Chinnakkannu
15a9d54958 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am: 7afb9854a7

Change-Id: I2598b482b4630279d47685381ddac9c746fbe12d
2019-08-23 20:31:09 -07:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Arc Wang
ea15072a94 Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
am: 318be48d07

Change-Id: I6a33141d8e12a3a16d723b506c986eff941956c9
2019-08-22 22:23:57 -07:00
TreeHugger Robot
318be48d07 Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev 2019-08-23 05:04:35 +00:00
Bonian Chen
128de7bdb6 [Settings] hide preferred network mode UI
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.

Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
      atest EnabledNetworkModePreferenceControllerTest
      Manual with AT&T SIM card in out of servce and in service

Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-08-22 14:36:12 -07:00
SongFerng Wang
f1a5d8a08a Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev
am: 201fc40816

Change-Id: I76ac45fbc93bf01bbc4783fecfd3eed8b9dbb6d2
2019-08-22 03:01:21 -07:00
SongFerng Wang
201fc40816 Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev 2019-08-22 09:49:27 +00:00
andychou
34fc2495d2 If the user add APN with empty APN type, map it for default type
Original behavior will map all APN type if enter empty APN type. But it
sometimes cause problem that MMS or IMS not working when select to this
custom APN. So if the user doesn't enter any APN type, just map to
valure of carrier config 'apn_settings_default_apn_types_string_array'
to avoid all the functions broken.

Bug: 129704611
Test: 1.Enter empty APN type and check if only default is added into
APN. 2.atest ApnEditorTest pass.
Change-Id: Icec274e5b402af06822479bcc60294b347f5254f
2019-08-21 21:20:49 +08:00
Goven Liu
fe3548ef41 Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev
am: cfcfb024c4

Change-Id: If72465328b970ce0d8e9d0c69f0a229a528bdbee
2019-08-20 22:36:09 -07:00
govenliu
14a74125e6 [Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog
We should set the same theme which applied in Settings APP to the NetworkRequestDialog

Bug: 139294487
Test: check if the right theme is applied when launching this activity.
Change-Id: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
Merged-In: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
2019-08-21 12:23:32 +08:00
Arc Wang
3fff50e3ba [Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator
WifiTracker#getAccessPoints() only contains a hidden SSID Wi-Fi
network if it's a saved Wi-Fi network. We can't check if a hidden
SSID Wi-Fi network is reachable inadvance. That is the difference
after a user scanned a QR code of hidden SSID Wi-Fi network.

Bug: 135892509
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppUtilsTest
      manual test:
      Click the Share button of a connected hidden SSID Wi-Fi network
      and save the QR code image. Use Wi-Fi QR code scanner in Wi-Fi
      Settings to scan the saved QR code image.

Change-Id: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
Merged-In: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
2019-08-20 16:15:02 +08:00
Arc Wang
a266ec8ffd Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
am: 0e53b6293d

Change-Id: I574c161e5cdde8f879031ff403082dddefe0dbb9
2019-08-17 07:27:01 -07:00
Arc Wang
0e53b6293d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
2019-08-17 07:18:03 -07:00
Arc Wang
2394d0821b Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I19214265a783f092bb183b3341aa1c2116f3188f
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819 Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am: 54dbed859d

Change-Id: I7267b4fe82f6e5e6e6523463eb710049c68e66f9
2019-08-17 07:17:59 -07:00
Arc Wang
91200e610d [Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.

This fix check the setting of active subscription and shows the preference.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Yi Jiang
943e7b34e8 Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
am: 7933af0273

Change-Id: Ibb750cc10763ade05e3f611a22e602ea3ebe7d5e
2019-08-12 18:41:16 -07:00
Yi Jiang
7933af0273 Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev 2019-08-13 01:28:31 +00:00
Arc Wang
3e64c28534 [Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
am: bde8c0a64d

Change-Id: I82e94257097ab902a72a0dc7d64ff50241938e24
2019-08-08 01:21:32 -07:00
Arc Wang
bde8c0a64d [Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
1. Only support EAP-TLS for WPA3-Enterprise 192-bit
2. Remove "Do not validate" from the CA certificate menu
3. Remove "Do not provide" from user certificate menu

Bug: 135127581
Test: WifiConfigControllerTest
Change-Id: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
Merged-In: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
2019-08-08 14:52:08 +08:00
Yi Jiang
811908f568 Don't show suggestion slice if 'Screen attention' is already on
Bug: 137259771
Fix: 137259771
Test: Manually

Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
(cherry picked from commit 06f0bd6d4e)
Merged-In: I5568b569ecd4db943f1a239c7ddcd2923bec4028
2019-08-05 17:06:24 +00:00
Edgar Wang
fc0aec7f1a Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
am: 3448917d8e

Change-Id: Ib451284c689f984e8064af58ef538b34e8ec6784
2019-08-01 23:00:21 -07:00
Edgar Wang
3448917d8e Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
2019-08-01 22:49:22 -07:00
Edgar Wang
063cc34713 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
2019-08-01 22:49:22 -07:00
Edgar Wang
345315c440 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
am: 8e3b202070

Change-Id: I37b7b29cd4c88948a6e7f0197bec84d0d1c2b0e4
2019-08-01 22:49:04 -07:00
Edgar Wang
8e3b202070 Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev 2019-08-02 05:38:23 +00:00
Youming Ye
34599f661d Check the missing useHomeWfMode case am: b7923f5a3f
am: de8c3c5fd3

Change-Id: I068d40471deb73869b0586e2bd4ebbba522ac85d
2019-08-01 11:41:05 -07:00
Youming Ye
d893200d78 Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I359a8f3a93837b54a119f7dd9d8a7ca3b508e257
2019-08-01 11:30:47 -07:00
Youming Ye
84049d217d Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
2019-08-01 11:27:48 -07:00
Youming Ye
de8c3c5fd3 Check the missing useHomeWfMode case
am: b7923f5a3f

Change-Id: I8ffa6acb13e07b4a28b8f46b348ffc47c143a317
2019-08-01 11:24:55 -07:00
Edgar Wang
58a5be4401 Add skip lock screen in Notification & security lock screen settings
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >

Bug: 138458558
Test: robotest & manual

Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Youming Ye
b7923f5a3f Check the missing useHomeWfMode case
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-07-31 16:38:32 -07:00
Antony Sargent
bf2c5ce274 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
am: ad2f49f851

Change-Id: I3caaf466e7c62cee4de6ef2a4e9695e8725736f1
2019-07-31 16:06:59 -07:00
Antony Sargent
e744ee1295 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I1ce1afeee9ab139ff47a1deec14d536c8c9529ad
2019-07-31 16:04:54 -07:00
Antony Sargent
81aab4471a Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: Id759b8df825b2be7c0a4abff45630916807c1d19
2019-07-31 16:04:53 -07:00
Antony Sargent
ad2f49f851 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
am: 4685c785b9

Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
2019-07-31 15:56:00 -07:00
TreeHugger Robot
4685c785b9 Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev 2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e Protect entry points to add an eSIM when admin restricted
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.

The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.

The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.

Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Quang Luong
b66a8c86a4 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev am: 17908b1e8f
am: 5c4a0e3444

Change-Id: Ib5545caea7cce930898c81fc0158877416666f89
2019-07-30 17:26:35 -07:00
Quang Luong
5c4a0e3444 Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: Ie1cdb83f47bac988b93401b3994a096d85333ce6
2019-07-30 17:16:00 -07:00
Quang Luong
815af2ba6e Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: I0adf1cc87a31b4daa762baf67e2e99415b35491a
2019-07-30 17:12:17 -07:00
Quang Luong
877d4d6d0a Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev
am: 17908b1e8f

Change-Id: I52e92aeffd349ed17f832b34b352f28a6c575ccb
2019-07-30 17:10:59 -07:00
TreeHugger Robot
17908b1e8f Merge "Default MAC address should display "Not Available" in network details" into qt-r1-dev 2019-07-30 23:33:22 +00:00
Antony Sargent
96c01305b2 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 5a39d48ab2

Change-Id: I997f4cacaed95a2cc77af01cebc6d4452368d05e
2019-07-30 15:58:36 -07:00
Antony Sargent
d188932f64 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: I0123b5872e6a55f8c39ce4e07c0b740170178915
2019-07-30 15:45:19 -07:00
Antony Sargent
5a39d48ab2 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: I7e1494a1859393844ad5810a9721bf3865ed5f75
2019-07-30 15:43:32 -07:00
Antony Sargent
9e58a8df39 Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev
am: 66208e734b

Change-Id: Ifb4c387a8663fda3a642b03b68777079d1c5a619
2019-07-30 15:43:32 -07:00
Antony Sargent
6d910e8608 Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.

Bug: 135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
2019-07-30 12:30:19 -07:00
Antony Sargent
01028402ca Merge "Refesh mobile network details page on carrier config changes" into qt-r1-dev am: 985d3d570d
am: 42861b21c9

Change-Id: I1b1b85bbdac1e12c51c855686a5c25e5581a40e4
2019-07-30 10:15:54 -07:00