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

Commit 4ca9ebd5 authored by Tony Mantler's avatar Tony Mantler
Browse files

Remove development settings prefs file 

Move DevelopmentSettingsEnabler to SettingsLib
Fix typo in SettingsLibRobolectricTestRunner

Bug: 64159590
Test: DevelopmentSettingsEnablerTest
Change-Id: I8a2a3407ff10c5db0417d13e735bae5dca1ff5b5
parent 200ae379

packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java

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

 * Copyright (C) 2017 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.settingslib.development;



import android.content.Context;

import android.content.Intent;

import android.os.Build;

import android.provider.Settings;

import android.support.v4.content.LocalBroadcastManager;



public class DevelopmentSettingsEnabler {



    public static final String DEVELOPMENT_SETTINGS_CHANGED_ACTION =

            "com.android.settingslib.development.DevelopmentSettingsEnabler.SETTINGS_CHANGED";



    private DevelopmentSettingsEnabler() {}



    public static void setDevelopmentSettingsEnabled(Context context, boolean enable) {

        Settings.Global.putInt(context.getContentResolver(),

                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, enable ? 1 : 0);

        LocalBroadcastManager.getInstance(context)

                .sendBroadcast(new Intent(DEVELOPMENT_SETTINGS_CHANGED_ACTION));

    }



    public static boolean isDevelopmentSettingsEnabled(Context context) {

        return Settings.Global.getInt(context.getContentResolver(),

                Settings.Global.DEVELOPMENT_SETTINGS_ENABLED,

                Build.TYPE.equals("eng") ? 1 : 0) != 0;

    }

}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import org.robolectric.annotation.Config; 


import java.util.Arrays;



@RunWith(SettingLibRobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class RestrictedLockUtilsTest {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.never; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



@RunWith(SettingLibRobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class RestrictedPreferenceHelperTest {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingLibRobolectricTestRunner.java→packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import org.robolectric.res.ResourcePath; 


import java.util.List;



public class SettingLibRobolectricTestRunner extends RobolectricTestRunner {

public class SettingsLibRobolectricTestRunner extends RobolectricTestRunner {



    public SettingLibRobolectricTestRunner(Class<?> testClass) throws InitializationError {

    public SettingsLibRobolectricTestRunner(Class<?> testClass) throws InitializationError {

        super(testClass);

    }
@@ -43,7 +43,7 @@ public class SettingLibRobolectricTestRunner extends RobolectricTestRunner { 
            @Override

            public List<ResourcePath> getIncludedResourcePaths() {

                List<ResourcePath> paths = super.getIncludedResourcePaths();

                SettingLibRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths);

                SettingsLibRobolectricTestRunner.getIncludedResourcePaths(getPackageName(), paths);

                return paths;

            }

        };

packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import org.robolectric.annotation.Config; 
import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Mockito.when;



@RunWith(SettingLibRobolectricTestRunner.class)

@RunWith(SettingsLibRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class TetherUtilTest {