Commit Graph

2189 Commits

Author SHA1 Message Date
jackqdyulei
3d7e38bc57 Refactor wifi calling and video calling
Also add a Callback for 4gLte to notify update to video calling
preference controller

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I0b5009733251162327f02ccfae8b10ae56b961bc
2018-10-22 13:02:32 -07:00
TreeHugger Robot
f3fb639f49 Merge "Use main looper for PhoneStateListener" 2018-10-22 19:57:35 +00:00
jackqdyulei
6ac8d80fcb Use main looper for PhoneStateListener
Also init all subIds to INVALID in constructor

Change-Id: Ic66a2e5a24dbc10d52db0069f0e863c96ec12513
Fixes: 118070636
Test: Manual
2018-10-22 10:25:38 -07:00
jackqdyulei
ba7b3a8294 Refactor EuiccPreference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7192e40c5ff6eb064f29517c21021a095d505d7f
2018-10-19 14:58:31 -07:00
jackqdyulei
fd44f76bf7 Refactor DataServicePreference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I773aeabdc1964436cc1e67bbbe9ad7fa6494e504
2018-10-19 09:58:51 -07:00
jackqdyulei
502f3c6c91 Refactor 4gForLTE preference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I6a9d7044e16de2e70fadd97379b2a6de6d18525f
2018-10-19 09:57:54 -07:00
Lei Yu
c294ce437e Merge "Refactor another network mode preference" 2018-10-19 02:00:03 +00:00
jackqdyulei
9132ab5533 Refactor another network mode preference
This preference show up if phone is not in world mode and offer some
simplified choices.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I9204466be630f122fb02773d18a947706999ab79
2018-10-18 13:58:03 -07:00
jackqdyulei
1fccc048f5 Update id for Toolbar
If you use action_bar, it will show blank action bar.

Bug: 114749736
Test: Manual
Change-Id: I459eb00262e667446c88d7ff638b9a425a6eada2
2018-10-18 13:54:01 -07:00
Lei Yu
4ae062b7c8 Merge "Refactor PreferredNetworkModePreference" 2018-10-18 06:34:22 +00:00
jackqdyulei
e8a56c183a Refactor PreferredNetworkModePreference
Create preference controller for it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I456b0b954f47a6fb4c03926049b0579fd6488969
2018-10-17 21:26:30 -07:00
Lei Yu
5b0c051dcd Merge "Refactor roaming preference" 2018-10-18 00:44:47 +00:00
TreeHugger Robot
5477ffe081 Merge "Update toolbar for mobile network settings" 2018-10-17 20:20:08 +00:00
jackqdyulei
d622e14d85 Refactor roaming preference
Use preferenceController instead

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Idb0276ea0ed1738d93223e072338ba3c32498a9d
2018-10-17 13:03:26 -07:00
jackqdyulei
52b08e42ba Update toolbar for mobile network settings
Bug: 114749736
Test: Manual
Change-Id: I9b01df83215ca6974b096060fa8d6669307c96e1
2018-10-17 10:02:46 -07:00
Eran Messeri
54fca28215 Merge "Private DNS: Extract host verification code" 2018-10-17 16:59:57 +00:00
TreeHugger Robot
1e6455be09 Merge "Consider Private DNS user restriction" 2018-10-17 08:36:55 +00:00
jackqdyulei
5680477b8b Refactor DataUsagePreference
Move the logic to PreferenceController

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7a0845c0cbc3f33e23257831d0d4ed97e7a5cc04
2018-10-16 15:40:17 -07:00
jackqdyulei
1d133e3f04 Refactor carrier settings
Only show it when:
1. It is in CDMA or GSM mode
2. CarrierConfig tell settings to show it

Bug: 114749736
Test: RunSettingsRoboTests

Change-Id: I45ecbc86c793ebec602142be208058e2043a2ba7
2018-10-16 15:33:20 -07:00
jackqdyulei
2de3d28138 Refactor CdmaApnPreference
Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I3d0203b7b5fb732e2814fb741761af4371924e9a
2018-10-16 15:33:20 -07:00
jackqdyulei
37f2e60b8c Refactor CdmaSubscriptionListPreference
Extract CdmaBasePreferenceController that can be shared by all CDMA
PreferenceController. Also create new subscription controller to use
it.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I7cfc27ffd0704d09dc02e49fbf5641ff8b90642d
2018-10-16 15:33:20 -07:00
Eran Messeri
717194c87c Consider Private DNS user restriction
As a new user restriction, to disallow changing Private DNS settings, was
added, make the Private DNS mode dialog preference consider whether to
let the user modify it or not based on the presence of this restriction.

Bug: 112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: Manual, using TestDPC

Change-Id: If815860ace3aadf6f79fd23173f0a2c80a29f0e1
2018-10-15 21:34:47 +01:00
Eran Messeri
7ba739ba14 Private DNS: Extract host verification code
Since Private DNS host may now be set by the admin via the
DevicePolicyManager, extract the verification code to the
ConnectivityManager so it can be used both from Settings and framework
code.

Bug: 112982691
Test: See cts tests.
Change-Id: Ic091e4714f8d3f9f28042bc825cf57c991504f27
2018-10-15 11:53:38 +01:00
jackqdyulei
b820483fad Refactor CdmaSystemSelectListPreference
Most logic is copied from previous ListPreference however
1. Create PreferenceController for it
2. Extract API to check whether to display CMDA options
3. In controller, provide API to force display dialog

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: Ic40d2ac1dc1854df9c90d912ea9fc822531b413d
2018-10-12 10:11:58 -07:00
jackqdyulei
8eec6ff917 Change packagename to telephony
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
2018-10-11 11:46:38 -07:00
jackqdyulei
106ae1d742 Add activity for mobile network page
1. Extract the Tabhost to activity level, not fragment level. So
each mobile fragment has a constant subscriptionId
2. Use BottomNavigationView instead of TabHost

Bug: 114749736
Test: RunSettingsRoboTests
Change-Id: I43aebf2ec01a945697c6b2302ab750e715e4bfef
2018-10-08 11:00:35 -07:00
Raff Tsai
af9eb2d7a7 Application accepts null intents causing a crash
Change-Id: Ia7f98f43567f25ae7abc6e5ac7e07323e75d9047
Fixes: 116869239
Test: adb shell am start -n com.android.settings/com.android.settings.Settings\\\$ApnEditorActivity
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.network"
2018-10-02 02:04:41 +08:00
Youming Ye
60118d0618 Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83 am: 31576aae7c
am: d976002dea

Change-Id: Iec53ef5f156b986a61a085a0a7c758574a78cee2
2018-09-25 10:31:48 -07:00
Youming Ye
31576aae7c Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am: b7e3552b83

Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
2018-09-25 10:20:06 -07:00
Youming Ye
b7e3552b83 Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" 2018-09-25 17:04:10 +00:00
Torbjorn Eklund
25249e4314 Merge "ApnEditor: Consider subId when reading carrier config" am: f6f7079709 am: db353e2c4a
am: bfe80e39f2

Change-Id: I848fd4084f43b2aeb69cb5175c1c10de3355c21f
2018-09-24 11:08:59 -07:00
Torbjorn Eklund
db353e2c4a Merge "ApnEditor: Consider subId when reading carrier config"
am: f6f7079709

Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
2018-09-24 10:48:00 -07:00
Torbjorn Eklund
ae8e62f4d0 ApnEditor: Consider subId when reading carrier config
Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.

This ensures that the APN will be editable or non-editable correctly
when using dual sim.

Bug: 112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
2018-09-20 13:12:54 +00:00
Ben Lin
3210396de9 Check for Data Usage intent before populating "Data Usage" summary.
On some devices, data usage is not available; thus, it is possible that
ACTION_DATA_USAGE_SETTINGS has no matching activity. If no matching
activity is found, we should not populate "data usage" in the summary
field.

Bug: 111398942
Test: Manual check. I see that data usage is no longer visible on
devices without Data Usage activity.
Test: make RunSettingsRoboTests

Change-Id: I838206b76497c6550ef4826ad19e605cd32906ee
2018-09-05 02:29:04 -07:00
Fan Zhang
de117046ad DO NOT MERGE Import clean up.
Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98
2018-09-04 13:54:46 -07:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
Aurimas Liutikas
03fcde338b Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
(cherry picked from commit b1af85d155)
2018-08-28 16:35:52 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Aurimas Liutikas
b1af85d155 Migrate Settings to androidx.
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit a290b873d0)
2018-08-28 11:48:56 -07:00
Yuchen Dong
20fb65fb84 Wrong Carrier Config values are used in ApnSettings for Multi SIM device
In ApnSettings, it always uses Carrier Config values of default subId.
So, wrong carrier config values are used for non-default subId.
To resolve this issue, read Carrier Config values based on subId.

Test: manual - Check Carrier Config values are read based on subId.
Bug: 111172301

Change-Id: I87e4cbb2e8020198fa03c2c84ef9bd10d5970341
2018-08-23 21:14:07 +09:00
jackqdyulei
a9fa4c1d05 Hook up feature flag to mobile network controller
Send intent to phone process if the flag is false.

Bug: 113069948
Test: RunSettingsRoboTests
Change-Id: Ie9726470e718144557f318fe7ea28e863d63679c
2018-08-22 17:58:09 -07:00
Jordan Liu
1aabc2cc4e Merge "Refresh subscription info when subid changes" am: 5226ac6110 am: 114cacf2a8
am: 611d824110

Change-Id: I29492ef016c8ca9836ecf28c787e441629cfecb0
2018-08-15 18:23:10 -07:00
Jordan Liu
b1facd2001 Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().

Fixes: 111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
2018-08-15 11:37:24 -07:00
irisykyang
40f4f799bb Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug: 77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
2018-08-14 15:55:43 -07:00
Fan Zhang
25d9f3812b [Dynamic Home] Make a new page for all top level settings
Since we are moving conditionals/suggestions to a different place, there
is no need to use DashboardSummary to display top level settings any
more. We can simplify a lot of code for top level settings and reduce it
to a standard DashboardFragment.

- Create a new DashboardFragment + xml for all top level internal items
- Add a PreferenceController to provide summary for Network & internet
  item.
- Mark a bunch of things deprecated for future work.

Bug: 110405144
Test: robotests
Change-Id: I9f778777131c28eb836b722e089e026a59f5ddc6
2018-08-08 17:20:15 -07:00
Jordan Liu
f546b97db9 Preserve leading 0s in mcc mnc
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
2018-08-08 11:35:15 -07:00
TreeHugger Robot
fa44a94aa9 Merge "Add a boolean flag to show or hide Private DNS in Network & internet." 2018-08-06 19:07:14 +00:00
Ben Lin
bc4b584446 Add a boolean flag to show or hide Private DNS in Network & internet.
The following boolean flag is added:
config_show_private_dns_settings

When set to false, Private DNS will not be shown in Network & internet.

Bug: 111398942
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Change-Id: I62911930680355b7fc109b295d8526bdb7eac0b3
2018-07-26 12:12:25 -07:00
Ben Lin
96dc235f6e Check for WiFi controller for summary population.
WiFiController might return not available, so we should only surface
"Wi-Fi" as a summary entry if it's available in the settings page.

This also checks for empty strings in case they are declared as such in
the XML (since XML can be device/product overlay'd), to avoid situations
such as ", data usage".

Bug: 111398942
Test: Manual check, and I see Wi-Fi no longer visible for cases where
Wifi controller isn't available.
Test: make RunSettingsRoboTests
Change-Id: I24736a6240c50e2ea38ce424fbac2316721290d8
2018-07-25 14:14:11 -07:00
tmfang
41ab6b4bf8 Migrate all AlertDialogs to AndroidX version
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
2018-07-20 11:32:13 +08:00