GUP: Add global switch for all apps
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fddcdc8..cdaab95 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10059,6 +10059,8 @@
<string name="gup_dashboard_title">Game Update Package Preferences</string>
<!-- Summary for Game Update Package dashboard [CHAR LIMIT=50] -->
<string name="gup_dashboard_summary">Modify Game Update Package settings</string>
+ <!-- Title for Game Update Package all apps preference [CHAR LIMIT=50] -->
+ <string name="gup_all_apps_switch_title">Enable for all apps</string>
<!-- Title for Game Update Package preference [CHAR LIMIT=50] -->
<string name="gup_app_preference_title">Select Graphics Driver</string>
<!-- The default value for Game Update Package preference [CHAR LIMIT=50] -->
diff --git a/res/xml/gup_settings.xml b/res/xml/gup_settings.xml
index 43ba39b..09bca71 100644
--- a/res/xml/gup_settings.xml
+++ b/res/xml/gup_settings.xml
@@ -21,6 +21,12 @@
android:key="gup_settings"
android:title="@string/gup_dashboard_title">
+ <SwitchPreference
+ android:key="gup_all_apps_preference"
+ android:title="@string/gup_all_apps_switch_title"
+ settings:controller="com.android.settings.development.gup.GupEnableForAllAppsPreferenceController">
+ </SwitchPreference>
+
<PreferenceCategory
android:key="gup_category"
android:title="@string/gup_app_preference_title"
diff --git a/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java
new file mode 100644
index 0000000..43a28b6
--- /dev/null
+++ b/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019 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.development.gup;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+
+public class GupEnableForAllAppsPreferenceController
+ extends BasePreferenceController implements Preference.OnPreferenceChangeListener {
+ public static final int GUP_DEFAULT = 0;
+ public static final int GUP_ALL_APPS = 1;
+
+ private final ContentResolver mContentResolver;
+
+ public GupEnableForAllAppsPreferenceController(Context context, String key) {
+ super(context, key);
+ mContentResolver = context.getContentResolver();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
+ ? AVAILABLE
+ : DISABLED_DEPENDENT_SETTING;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ final SwitchPreference switchPreference = screen.findPreference(getPreferenceKey());
+ if (switchPreference == null) {
+ return;
+ }
+
+ switchPreference.setChecked(Settings.Global.getInt(mContentResolver,
+ Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
+ == GUP_ALL_APPS);
+ switchPreference.setOnPreferenceChangeListener(this);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ // When developer option is present, always overwrite GUP_DEV_ALL_APPS.
+ Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS,
+ (boolean) newValue ? GUP_ALL_APPS : GUP_DEFAULT);
+
+ return true;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceControllerTest.java
new file mode 100644
index 0000000..b7aadc3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceControllerTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2019 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.development.gup;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_ALL_APPS;
+import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class GupEnableForAllAppsPreferenceControllerTest {
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private SwitchPreference mPreference;
+
+ private Context mContext;
+ private ContentResolver mResolver;
+ private GupEnableForAllAppsPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mResolver = mContext.getContentResolver();
+ mController = new GupEnableForAllAppsPreferenceController(mContext, "testKey");
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+ }
+
+ @Test
+ public void getAvailability_developmentSettingsEnabled_available() {
+ Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailability_developmentSettingsDisabled_disabledDependentSetting() {
+ Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+ }
+
+ @Test
+ public void displayPreference_shouldAddSwitchPreference() {
+ Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+ mController.displayPreference(mScreen);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void onPreferenceChange_check_shouldUpdateSettingsGlobal() {
+ Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, true);
+
+ assertThat(Settings.Global.getInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT))
+ .isEqualTo(GUP_ALL_APPS);
+ }
+
+ @Test
+ public void onPreferenceChange_uncheck_shouldUpdateSettingsGlobal() {
+ Settings.Global.putInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_ALL_APPS);
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, false);
+
+ assertThat(Settings.Global.getInt(mResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT))
+ .isEqualTo(GUP_DEFAULT);
+ }
+}