PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-15 09:23:58 +00:00
committed by Android (Google) Code Review
parent 153c3a1dc2 c4eb3b1320
commit 1ce0d1117e
6 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
View File

@@ -78,7 +78,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
return false;
}
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(isChecked);
updateCarrierNetworkPreference(isChecked);
return true;
}
@@ -86,21 +85,17 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mCarrierNetworkPreference = screen.findPreference(CARRIER_WIFI_NETWORK_PREF_KEY);
updateCarrierNetworkPreference(isChecked());
updateCarrierNetworkPreference();
}
@Override
public void onWifiStateChanged() {
if (mCarrierNetworkPreference != null && mCarrierNetworkPreference.isVisible()) {
mCarrierNetworkPreference.setSummary(getCarrierNetworkSsid());
}
updateCarrierNetworkPreference();
}
@Override
public void onWifiEntriesChanged() {
if (mCarrierNetworkPreference != null && mCarrierNetworkPreference.isVisible()) {
mCarrierNetworkPreference.setSummary(getCarrierNetworkSsid());
}
updateCarrierNetworkPreference();
}
@Override
@@ -113,11 +108,11 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
// Do nothing
}
protected void updateCarrierNetworkPreference(boolean isCarrierNetworkEnabled) {
protected void updateCarrierNetworkPreference() {
if (mCarrierNetworkPreference == null) {
return;
}
if (!isCarrierNetworkEnabled || getAvailabilityStatus() != AVAILABLE) {
if (getAvailabilityStatus() != AVAILABLE || !isCarrierNetworkActive()) {
mCarrierNetworkPreference.setVisible(false);
return;
}
@@ -125,6 +120,13 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
mCarrierNetworkPreference.setSummary(getCarrierNetworkSsid());
}
protected boolean isCarrierNetworkActive() {
if (mWifiPickerTrackerHelper == null) {
return false;
}
return mWifiPickerTrackerHelper.isCarrierNetworkActive();
}
protected String getCarrierNetworkSsid() {
if (mWifiPickerTrackerHelper == null) {
return null;

10
src/com/android/settings/network/SubscriptionsPreferenceController.java
View File

@@ -277,12 +277,12 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
final boolean isDataInService = tmForSubId.getDataState()
== TelephonyManager.DATA_CONNECTED;
final boolean isActiveCarrierNetwork =
final boolean isCarrierNetworkActive =
(mWifiPickerTrackerHelper != null)
&& mWifiPickerTrackerHelper.isActiveCarrierNetwork();
&& mWifiPickerTrackerHelper.isCarrierNetworkActive();
String result = mSubsPrefCtrlInjector.getNetworkType(
mContext, mConfig, mTelephonyDisplayInfo, subId, isActiveCarrierNetwork);
if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isActiveCarrierNetwork) {
mContext, mConfig, mTelephonyDisplayInfo, subId, isCarrierNetworkActive);
if (mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext) || isCarrierNetworkActive) {
Log.i(TAG, "Active cellular network or active carrier network.");
result = mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(R.string.mobile_data_connection_active), result);
@@ -306,7 +306,7 @@ public class SubscriptionsPreferenceController extends AbstractPreferenceControl
final boolean isActiveCellularNetwork =
mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);
if (isActiveCellularNetwork || (mWifiPickerTrackerHelper != null)
&& mWifiPickerTrackerHelper.isActiveCarrierNetwork()) {
&& mWifiPickerTrackerHelper.isCarrierNetworkActive()) {
icon.setTint(Utils.getColorAccentDefaultColor(mContext));
return icon;
}

2
src/com/android/settings/network/telephony/NetworkProviderWorker.java
View File

@@ -261,7 +261,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements
String iconKey = getIconKey(telephonyDisplayInfo);
int resId = mapIconSets(config).get(iconKey).dataContentDescription;
if (mWifiPickerTrackerHelper != null
&& mWifiPickerTrackerHelper.isActiveCarrierNetwork()) {
&& mWifiPickerTrackerHelper.isCarrierNetworkActive()) {
MobileIconGroup carrierMergedWifiIconGroup = TelephonyIcons.CARRIER_MERGED_WIFI;
resId = carrierMergedWifiIconGroup.dataContentDescription;
return resId != 0

6
src/com/android/settings/wifi/WifiPickerTrackerHelper.java
View File

@@ -77,7 +77,7 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
Process.THREAD_PRIORITY_BACKGROUND);
mWorkerThread.start();
mWifiPickerTracker = FeatureFactory.getFactory(context)
mWifiPickerTracker = FeatureFactory.getFactory(context)
.getWifiTrackerLibProvider()
.createWifiPickerTracker(lifecycle, context,
new Handler(Looper.getMainLooper()),
@@ -139,8 +139,8 @@ public class WifiPickerTrackerHelper implements LifecycleObserver {
return true;
}
/** Confirms connection of the carrier network */
public boolean isActiveCarrierNetwork() {
/** Confirms connection of the carrier network connected with the internet access */
public boolean isCarrierNetworkActive() {
final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
if (mergedCarrierEntry != null) {
return mergedCarrierEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED