diff options
16 files changed, 135 insertions, 24 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java b/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java new file mode 100644 index 000000000000..4e78d9b3d33c --- /dev/null +++ b/packages/SettingsLib/src/com/android/settingslib/development/DevelopmentSettingsEnabler.java @@ -0,0 +1,44 @@ +/* + * 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; + } +} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java index c506358138e5..c3a505ac67f4 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedLockUtilsTest.java @@ -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 { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java index e5ad6ab84a48..79d99f75b5bf 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/RestrictedPreferenceHelperTest.java @@ -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 { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingLibRobolectricTestRunner.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java index 482b788113b9..8099eb11edb4 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingLibRobolectricTestRunner.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/SettingsLibRobolectricTestRunner.java @@ -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; } }; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java index 3b1c3ac850bd..8bd31d4789db 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TetherUtilTest.java @@ -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 { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java index 505d7a6c5a06..fa654cb18d83 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/TwoTargetPreferenceTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.spy; 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 TwoTargetPreferenceTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java index 0164f80e68f8..c6cfdb80d851 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java @@ -27,7 +27,7 @@ import static org.mockito.Mockito.when; import android.content.res.Resources; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class UtilsTest { private static final double[] TEST_PERCENTAGES = {0, 0.4, 0.5, 0.6, 49, 49.3, 49.8, 50, 100}; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java index 585633226e59..d6bca0e27b3b 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/core/lifecycle/LifecycleTest.java @@ -20,7 +20,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.events.OnAttach; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; @@ -41,7 +41,7 @@ import org.robolectric.util.FragmentController; import static com.google.common.truth.Truth.assertThat; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class LifecycleTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java new file mode 100644 index 000000000000..d19d19ab62e9 --- /dev/null +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/DevelopmentSettingsEnablerTest.java @@ -0,0 +1,67 @@ +/* + * 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 static com.google.common.truth.Truth.assertThat; + +import android.content.Context; +import android.provider.Settings; + +import com.android.settingslib.SettingsLibRobolectricTestRunner; +import com.android.settingslib.TestConfig; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +@RunWith(SettingsLibRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class DevelopmentSettingsEnablerTest { + + private Context mContext; + + @Before + public void setUp() { + mContext = RuntimeEnvironment.application; + } + + @Test + public void testEnabling() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0); + + assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse(); + + DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, true); + + assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isTrue(); + } + + @Test + public void testDisabling() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); + + assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isTrue(); + + DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, false); + + assertThat(DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)).isFalse(); + } +} diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java index 0778b2739910..a16fa529e7cf 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/development/EnableAdbPreferenceControllerTest.java @@ -34,7 +34,7 @@ import android.support.v14.preference.SwitchPreference; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import org.junit.Before; @@ -45,7 +45,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class EnableAdbPreferenceControllerTest { @Mock(answer = RETURNS_DEEP_STUBS) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawable/UserIconDrawableTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawable/UserIconDrawableTest.java index a21390a4d156..5fdd1149b90f 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawable/UserIconDrawableTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawable/UserIconDrawableTest.java @@ -20,7 +20,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import com.android.settingslib.R; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import org.junit.Test; @@ -30,7 +30,7 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class UserIconDrawableTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java index 8d61338f86c3..d7eae5f143c3 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/CategoryManagerTest.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Intent; import android.util.Pair; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import org.junit.Before; @@ -35,7 +35,7 @@ import java.util.Map; import static com.google.common.truth.Truth.assertThat; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class CategoryManagerTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java index 83911360bdfe..1826006fe2be 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/suggestions/SuggestionParserTest.java @@ -26,7 +26,7 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.preference.PreferenceManager; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import com.android.settingslib.drawer.Tile; import com.android.settingslib.drawer.TileUtilsTest; @@ -44,7 +44,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class SuggestionParserTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java index ded1574ca829..97fda996c80d 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceMixinTest.java @@ -20,7 +20,7 @@ import android.support.v14.preference.PreferenceFragment; import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.times; 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 FooterPreferenceMixinTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java index 17b3de080046..5d01027f9505 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java @@ -23,7 +23,7 @@ import android.view.LayoutInflater; import android.widget.TextView; import com.android.settingslib.R; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import org.junit.Before; @@ -34,7 +34,7 @@ import org.robolectric.shadows.ShadowApplication; import static com.google.common.truth.Truth.assertThat; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class FooterPreferenceTest { diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java index 7fe69a73cb99..08757b28a686 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/AccessPointPreferenceTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.when; import android.content.Context; -import com.android.settingslib.SettingLibRobolectricTestRunner; +import com.android.settingslib.SettingsLibRobolectricTestRunner; import com.android.settingslib.TestConfig; import org.junit.Test; @@ -29,7 +29,7 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -@RunWith(SettingLibRobolectricTestRunner.class) +@RunWith(SettingsLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class AccessPointPreferenceTest { |