diff --git a/res/values/bools.xml b/res/values/bools.xml index ab8a6fd1475..617ab7bbf07 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -158,4 +158,13 @@ true + + + true + + + true + + + true diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index ee069da23a0..831c630337e 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -41,7 +41,7 @@ public class DeviceModelPreferenceController extends AbstractPreferenceControlle @Override public boolean isAvailable() { - return true; + return mContext.getResources().getBoolean(R.bool.config_show_device_model); } @Override diff --git a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java index f4e2f8cefb0..1af63975f5d 100644 --- a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java @@ -19,6 +19,8 @@ package com.android.settings.deviceinfo; import android.content.Context; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.R; + import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController; @@ -31,5 +33,10 @@ public class IpAddressPreferenceController extends AbstractIpAddressPreferenceCo super(context, lifecycle); } + @Override + public boolean isAvailable() { + return mContext.getResources().getBoolean(R.bool.config_show_wifi_ip_address); + } + // This space intentionally left blank } diff --git a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java index 92390d750e0..8375310c107 100644 --- a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo; import android.content.Context; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController; @@ -31,5 +32,10 @@ public class WifiMacAddressPreferenceController extends AbstractWifiMacAddressPr super(context, lifecycle); } + @Override + public boolean isAvailable() { + return mContext.getResources().getBoolean(R.bool.config_show_wifi_mac_address); + } + // This space intentionally left blank } diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index e755f27472e..137a08933f5 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -57,4 +57,7 @@ false false false + false + false + false diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index 6a5c7fa25f6..47bcf1c090d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -69,10 +69,16 @@ public class DeviceModelPreferenceControllerTest { } @Test - public void isAlwaysAvailable() { + public void isAvailable_returnTrueIfVisible() { assertThat(mController.isAvailable()).isTrue(); } + @Test + @Config(qualifiers = "mcc999") + public void isAvailable_returnFalseIfNotVisible() { + assertThat(mController.isAvailable()).isFalse(); + } + @Test public void displayPref_shouldSetSummary() { mController.displayPreference(mPreferenceScreen);