Fix logging spam in DashboardFragment.

When updating preferences managed through PreferenceController, the
fragment should skip prefs that are not available.

Bug: 32255863
Test: RunSettingsRoboTests
Change-Id: I2f9b6ddf8c78d40068dc18f07e60672dcba4474a
This commit is contained in:
Fan Zhang
2016-10-25 16:38:22 -07:00
parent 42a0870b8c
commit 242da31179
32 changed files with 58 additions and 40 deletions

View File

@@ -87,7 +87,7 @@ public class AirplaneModePreferenceController extends PreferenceController
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
return !mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION);
}

View File

@@ -45,7 +45,7 @@ public class MobileNetworkPreferenceController extends PreferenceController {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
return !mIsSecondaryUser
&& !Utils.isWifiOnly(mContext)
&& !hasBaseUserRestriction(mContext, DISALLOW_CONFIG_MOBILE_NETWORKS, myUserId());

View File

@@ -111,7 +111,7 @@ public class MobilePlanPreferenceController extends PreferenceController impleme
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
final boolean isPrefAllowedOnDevice = mContext.getResources().getBoolean(
com.android.settings.R.bool.config_show_mobile_plan);
final boolean isPrefAllowedForUser = !mIsSecondaryUser

View File

@@ -37,7 +37,7 @@ public class NetworkResetPreferenceController extends PreferenceController {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
}

View File

@@ -36,7 +36,7 @@ public class ProxyPreferenceController extends PreferenceController {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
// proxy UI disabled until we have better app support
return false;
}

View File

@@ -67,7 +67,7 @@ public class TetherPreferenceController extends PreferenceController {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
final boolean isBlocked =
(!mConnectivityManager.isTetheringSupported() && !mAdminDisallowedTetherConfig)
|| hasBaseUserRestriction(mContext, DISALLOW_CONFIG_TETHERING,

View File

@@ -58,7 +58,7 @@ public class VpnPreferenceController extends PreferenceController {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
// TODO: http://b/23693383
return mIsSecondaryUser || RestrictedLockUtils.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId());

View File

@@ -50,7 +50,7 @@ public class WifiCallingPreferenceController extends PreferenceController {
}
@Override
protected boolean isAvailable() {
public boolean isAvailable() {
return ImsManager.isWfcEnabledByPlatform(mContext)
&& ImsManager.isWfcProvisionedOnDevice(mContext);
}