Commit Graph

853 Commits

Author SHA1 Message Date
Automerger Merge Worker
4a4ee98a19 Merge "Update SharedPreference values based on tethering state" into rvc-dev am: 042aa85b50
Change-Id: I50df00daa2471adc120a9934febc4554a3608bde
2020-03-05 03:15:33 +00:00
Zhen Zhang
042aa85b50 Merge "Update SharedPreference values based on tethering state" into rvc-dev 2020-03-05 02:58:24 +00:00
Zhen Zhang
0c02d33818 Update SharedPreference values based on tethering state
TetherEnabler need to update tethering state of each tethering
interfaces to make sure other preferences that depends on these
SharedPreferences be consistent with UI.

Bug: 148968321
Test: TetherEnablerTest; CodeInspectionTest. Manully test, built and
flashed to crosshatch device.

Change-Id: Ie0be7748adf20e6fb0ff5489795b0ca0664b6323
2020-03-04 10:59:29 -08:00
Automerger Merge Worker
12d9e009a6 Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev am: 6bdf1393f8
Change-Id: I4eed6959e7c36171a7df1a37ce9087166ba75418
2020-03-04 18:06:25 +00:00
Brad Ebinger
6bdf1393f8 Merge "Add new DialogFragment and Controller for capability discovery opt-in" into rvc-dev 2020-03-04 18:05:25 +00:00
Brad Ebinger
66c709844a Add new DialogFragment and Controller for capability discovery opt-in
Adds a new controller to monitor the capability discovery opt-in
setting as well as a new DialogFragment, which displays a dialog
providing the user with more information before they enable the
setting.

Also removes multiple updateSubscriptions() happening when the
activity is first created from onStart() and onChanged() callbacks.

Bug: 111305845
Test: manual
Change-Id: I70821964bc618c3c389c9039cd7f5028e34c7ebb
2020-03-03 19:39:27 -08:00
Automerger Merge Worker
b3ff936644 Merge changes I3b1d1c4e,I11bdad27 into rvc-dev am: 5dbf99de82
Change-Id: I8fc697e7682b9da3243b2050820d1b0ba59efebb
2020-03-04 02:04:23 +00:00
Zhen Zhang
abb734920d Let tether preference controllers extend TogglePreferenceController
Refactored USBTether, BluetoothTether and WifiTetherDisable preference
controllers to extend TogglePreferenceControllers, since they are all
SwitchPreference.

Bug: 150634051
Test: UsbTetherPreferenceControllerTest,
BluetoothTetherPreferenceControllerTest,
WifiTetherDisablePreferenceControllerTest,
CodeInspectionTest

Change-Id: I3b1d1c4e678c65ced8dd506a87c3c43ed300d64f
2020-03-03 11:28:18 -08:00
Zhen Zhang
084875a104 Make tether option preferences listen to own SharedPreferences change
The SharedPreferences value could be changed by other classes. This can
help make UI consistent with shared preferences value.

Bug: 148968321
Test: UsbTetherPreferenceControllerTest;
BluetoothTetherPreferenceControllerTest;
WifiTetherDisablePreferenceControllerTest;
CodeInspectionTest.

Change-Id: I11bdad2729e88c07ea1f046d9e95a6a63b398931
2020-03-02 10:56:27 -08:00
Automerger Merge Worker
a8a09591c2 Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b
Change-Id: Idd1c67a5e20a373ea23c3b414236171692f6b64e
2020-03-02 18:41:15 +00:00
Sarah Chin
4d59bce21b Merge "Rename calls to isGlobalModeEnabled" into rvc-dev 2020-03-02 18:11:23 +00:00
Automerger Merge Worker
47efc875da Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec
Change-Id: Iead26d883a75dc45269a9f060ea74a6b8aae3084
2020-02-28 16:55:59 +00:00
Nathan Harold
b10babebd0 Optimize NetworkScan for only User-Enabled RANs
Network scans comprise multiple different access
technologies, and scanning each of those techs can
be very time consuming. Worse, depending on a user's
settings, the device may only be allowed to connect
to 2G, 2G+3G, or 2G+3G+4G networks. If a scan finds
network types that a user can't connect to, it also
creates a poor user experience if a user tries to
select those network types.

This CL restricts the scans to only find and return
results that a user can select based on the other
user settings.

Bug: 128572818
Test: manual (crosshatch) - set allowed networks to
 2G+3G and verify that LTE networks are not returned.
 Set allowed networks to 2G+3G+4G and verify that LTE
 networks are returned.

Merged-In: Ic855100723b8604c1e872457a70fd8f25d225278
Change-Id: Ic855100723b8604c1e872457a70fd8f25d225278
(cherry picked from commit bda277b3b6)
2020-02-27 16:10:19 -08:00
Sarah Chin
77dea1beb0 Rename calls to isGlobalModeEnabled
Test: atest FrameworksTelephonyTests
Bug: 148603998
Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
2020-02-27 16:00:13 -08:00
Automerger Merge Worker
c86e3124d4 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0
Change-Id: I97d2c2c3e80af00c64a54cfb7a6c0e844b2610a6
2020-02-27 15:49:31 +00:00
James.cf Lin
64ac0d4a74 [Settings] "Data during calls" in DDS SUB is still in advanced option.
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Change-Id: I0121f06efb5257dccc05ad06b93a9db263f012b5
2020-02-27 17:52:47 +08:00
Automerger Merge Worker
4a791935a6 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5
Change-Id: If2e85409f09d02876a496af93f76a2753e493da9
2020-02-27 08:55:25 +00:00
Lee Chou
c12b1b40ee Fixes ApnEditor not restoring previous UI
ApnEditor tries read and set the UI in onCreate, before the previous bundle
is restored. This caused problems when the configuration has changed (such
as switching to Dark Theme).

This moves the UI changes to onViewRestored

Fixes: 146399432
Test: make SettingsGoogle and manual test UI
Change-Id: I8147ec96569fa28867c088d6c36584aa344f40ed
2020-02-27 11:50:03 +08:00
Automerger Merge Worker
2d84cdbc3a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7 am: 840506e88a
Change-Id: Idc2d504f99fdea780fcda81a221e2f57bc242e82
2020-02-24 21:36:32 +00:00
Automerger Merge Worker
840506e88a Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
Change-Id: Ifa566bf809360db17a6932ee5ebaede2eb63e1b3
2020-02-24 21:15:28 +00:00
Xiangyu/Malcolm Chen
aaee4539c7 Merge "Catch crash in mobile network ProgressDialog" 2020-02-24 21:07:17 +00:00
Automerger Merge Worker
63da73532d Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
2020-02-21 22:23:21 +00:00
Daniel Hunt
9f74807e89 Catch crash in mobile network ProgressDialog
When enabling "Automatically select network" in "Settings -> Network &
internet -> Mobile network -> Advanced" and rotating the device while
the dialog is showing there will be an IllegalArgumentException since
the decorView isn't attached to the window when dismissing the dialog.
Fixed by simply catching the exception since the dialog will be gone
anyway.

Bug: 146057372
Test: manual (see comment above)
Change-Id: I15f1d6f505fdf33964ce973ece31d6aa0d8f3909
2020-02-21 10:47:12 +00:00
Sarah Chin
51617e3ceb Rename references to getLteOnCdmaMode
Use @SystemApi TelephonyManager#isGlobalModeEnabled()

Test: build
Bug: 147335742
Change-Id: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
Merged-In: Ie1b01a97cf163d68e4a5529f1718a9a782d44bb0
2020-02-20 16:43:13 -08:00
Lee Chou
df38d242be Merge "Added check for preference click" 2020-02-20 04:47:10 +00:00
Jiashen Wang
6980bebe47 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" 2020-02-19 23:59:14 +00:00
Bonian Chen
0c9f4e2ab4 Merge "[Settings] Code refactor" 2020-02-19 18:09:17 +00:00
Bonian Chen
a7fd2030f7 Merge "[Settings] Add FLAG_GRANT_READ_URI_PERMISSION to ApnEditor" 2020-02-19 16:44:01 +00:00
Lee Chou
22a1e5b2eb Added check for preference click
handlePreferenceTreeClick gets triggered even for other preferences, so
this check is added to handle the correct click

Bug: 138861284
Test: mp settingsg
Change-Id: I178814b4b194d24f38ad0bb74694a2c51d16c89a
2020-02-19 18:37:29 +08:00
Bonian Chen
8b750a02e4 [Settings] Code refactor
Moving instances in the same place within source code.

Bug: 141833767
Test: build pass
Change-Id: I350604a64a56151195f52d38bd258e34c76e40c5
2020-02-19 12:32:52 +08:00
Bonian Chen
66a301bb12 Merge "[Settings] Replace isVolteEnabledByPlatform" 2020-02-19 01:17:31 +00:00
Bonian Chen
d25e6ec97e [Settings] Add FLAG_GRANT_READ_URI_PERMISSION to ApnEditor
Add FLAG_GRANT_READ_URI_PERMISSION to ApnEditor helps to remove warnings
within logs and improve performance.

Bug: 149789688
Test: manual
Change-Id: I231fd4469efdbaf6c20da922411b16d4c34606ea
2020-02-19 08:50:53 +08:00
Lee Chou
5a65e2d5dd Authenticated confirmation before deletion of eSim
adds an authentication confirmation before deleting an eSim
this feature is turned on/off in the security page

Bug: 138861284
Test: mp settingsg
Change-Id: I32e0e3bff2091ec1097b3c37fa066d966e3373df
2020-02-18 11:33:22 +08:00
Betty Chang
74d5ae043c Merge "[Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice" am: 251329c85c
Change-Id: Iaec059c5f4bc8cef5dd4a6b77205bdd633782ed3
2020-02-17 06:46:24 +00:00
Zhen Zhang
370653a24b Merge "Update summary for AllInOneTetherPreference accordingly" 2020-02-17 05:50:55 +00:00
Bonian Chen
1716548685 [Settings] Replace isVolteEnabledByPlatform
Replace ImsManager#isVolteEnabledByPlatform() by ImsMmTelManager#isSupport().

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Change-Id: I656a00ad2c6120255e53d0b836945462258e01bb
2020-02-15 15:19:49 +08:00
changbetty
1a5351c433 [Mainline] To use getActiveSubscriptionInfo() instead of get default subscription Info with data/sms/voice
- getDefaultDataSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultDataSubscriptionId());
   - getDefaultSmsSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultSmsSubscriptionId());
   - getDefaultVoiceSubscriptionInfo()
   	- getActiveSubscriptionInfo(getDefaultVoiceSubscriptionId());

Bug: 147206736
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageUtilsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataSliceTest
      make RunSettingsRoboTests ROBOTEST_FILTER=MobileDataPreferenceControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=DefaultSubscriptionControllerTest

Change-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
Merged-Id: I7b5988b3c3068c12e242e123ebb54477093d37ad
2020-02-15 14:56:58 +08:00
Bonian Chen
64595f18d7 Merge "[Settings] Code refactor for IMS part" 2020-02-14 13:35:03 +00:00
Bonian Chen
4074e9aab7 [Settings] Code refactor for IMS part
Return boolean in method names starting with "is".

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Change-Id: I2a9ca9ae829f0dcda478f3343cd50e61f441a9a7
2020-02-14 16:29:11 +08:00
Zhen Zhang
c2b9e5ef20 Update summary for AllInOneTetherPreference accordingly
The summary for AllInOneTetherPreference in NetworkDashboardFragment is
updated according to tethering state and tether interface chosen by
user.

Bug: 149256198
Test: AllInOneTetherPreferenceControllerTest, TetherEnablerTest,
CodeInspectionTest

Change-Id: I24ba4deabbb02b203e76d32048040d7ccf1b2d22
2020-02-14 00:14:23 -08:00
Zoey Chen
7b8e8255cd Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe
Change-Id: I951346d955f2223fce1b4c88e72cd44a5e33e1a5
2020-02-14 07:01:49 +00:00
Zhen Zhang
c4a2294730 Merge "Add a Preference into "Network & internet" for new tethering UI" 2020-02-14 00:05:54 +00:00
Jiashen Wang
217e88710d Change MobileNetworkUtils to use EuiccManager.isSupportedCountry
Currently LPA passed supported/unsupported countries to Settings by
writing the value into properties which is not ideal. Instead, we should
call EuiccManager.isSupportedCountry instead.
Bug: 147674689
Test: 1) Manually tested by flashing the change to the device
2) Change LPA to override onGetIsEuiccSupportedCountry
3) Make sure LPA can get the request

Change-Id: Ib136beea325eabdfbd8a6a843611143958dce603
2020-02-13 18:36:00 +00:00
Zhen Zhang
31f1a34629 Add a Preference into "Network & internet" for new tethering UI
Adding a MasterSwitchPreference into "Network & internet" and create
corresponding controller. The preference is hidden by the feature flag.
It does NOT affect the existing UI.

Bug: 146147778
Test: CodeInspectionTest, TetherPreferenceControllerTest,
NetworkDashboardFragmentTest
Change-Id: Ida8e088efbb22d0c983acecbc420672206392dad
2020-02-12 23:55:02 -08:00
Bonian Chen
4ad801403a Merge "[Settings] Performance tuning for intent ACTION_ENHANCED_4G_LTE_CHANGED" 2020-02-13 04:59:15 +00:00
TreeHugger Robot
db818cb53c Merge "Fix Wifi & Bluetooth slice can't show on search result" 2020-02-12 10:39:28 +00:00
Edgar Wang
7312defa4a Fix Wifi & Bluetooth slice can't show on search result
root cause: we remove wifi & bluetooth preference screen key from search
indexing, this cause these 2 special slices can't map to correct key

solution: rename preference key for mapping

Bug: 149366072
Test: robotest & manual
Change-Id: Id424e63c4f97ccd6f58a80aaa414807774159512
2020-02-12 17:07:34 +08:00
Zhen Zhang
c56872348f Merge "Update summary for WifiTetherDisablePreference accordingly" 2020-02-12 06:18:00 +00:00
Bonian Chen
f9bf994ae0 Merge "[Settings] Code refactor for Wifi calling IMS API" 2020-02-12 06:14:31 +00:00
Bonian Chen
cf19596829 Merge "[Settings] Data roaming warning only when turn ON" 2020-02-12 06:14:20 +00:00