diff --git a/res/values/bools.xml b/res/values/bools.xml index c490365fe4a..74c17541037 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -57,6 +57,9 @@ true + + true + true diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java new file mode 100644 index 00000000000..ec487e46af0 --- /dev/null +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.location; + +import android.content.Context; + +import com.android.settings.core.BasePreferenceController; +import com.android.settings.R; + +import android.support.annotation.VisibleForTesting; + + +public class LocationScanningPreferenceController extends BasePreferenceController { + + @VisibleForTesting static final String KEY_LOCATION_SCANNING = "location_scanning"; + + public LocationScanningPreferenceController(Context context) { + super(context, KEY_LOCATION_SCANNING); + } + + @AvailabilityStatus + public int getAvailabilityStatus() { + return mContext.getResources().getBoolean(R.bool.config_show_location_scanning) + ? AVAILABLE + : DISABLED_UNSUPPORTED; + } +} \ No newline at end of file diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 1279d677c50..8be5b811127 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -138,6 +138,7 @@ public class LocationSettings extends DashboardFragment { new RecentLocationRequestPreferenceController(context, fragment, lifecycle)); controllers.add( new LocationServicePreferenceController(context, fragment, lifecycle)); + controllers.add(new LocationScanningPreferenceController(context)); return controllers; } diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index 7bb80e888c3..9bfec4c1bc1 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -27,6 +27,7 @@ false false false + false false false false diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java new file mode 100644 index 00000000000..7577ac1c270 --- /dev/null +++ b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.location; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + +import android.content.Context; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class LocationScanningPreferenceControllerTest { + + private Context mContext; + private LocationScanningPreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = spy(RuntimeEnvironment.application.getApplicationContext()); + mController = new LocationScanningPreferenceController(mContext); + } + + @Test + public void testLocationScanning_byDefault_shouldBeShown() { + assertThat(mController.isAvailable()).isTrue(); + } + + @Test + @Config(qualifiers = "mcc999") + public void testLocationScanning_ifDisabled_shouldNotBeShown() { + assertThat(mController.isAvailable()).isFalse(); + } +} \ No newline at end of file