Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8377718 authored by Ben Lin's avatar Ben Lin
Browse files

Introduce boolean flag to show/hide Location Scanning preference. 

This introduce one new flag:
config_show_location_scanning

Which when set to false, will hide "Scanning" in Location preference.

Some OEMs may control Bluetooth/Wi-Fi scanning themselves, so they may
want to hide the page from users.

Bug: 62418710
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=LocationScanningPreferenceControllerTest

Change-Id: I19f0020a2c94f70b3b7956529f57af098ccc79fd
parent b1f6f24d

res/values/bools.xml

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ 
    <!-- Whether location mode is available or not. -->

    <bool name="config_location_mode_available">true</bool>



    <!-- Whether location scanning is available or not. -->

    <bool name="config_show_location_scanning">true</bool>



    <!-- Whether high_power_apps should be shown or not. -->

    <bool name="config_show_high_power_apps">true</bool>

src/com/android/settings/location/LocationScanningPreferenceController.java

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * 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

src/com/android/settings/location/LocationSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }

tests/robotests/res/values-mcc999/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
    <bool name="config_show_data_saver">false</bool>

    <bool name="config_show_enabled_vr_listeners">false</bool>

    <bool name="config_location_mode_available">false</bool>

    <bool name="config_show_location_scanning">false</bool>

    <bool name="config_show_wallpaper_attribution">false</bool>

    <bool name="config_show_default_home">false</bool>

    <bool name="config_show_accessibility_shortcut_preference">false</bool>

tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * 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