From 9511d443cb1a5d815a15c9bdd9945b719a581cd2 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Thu, 13 Aug 2020 20:24:25 -0700 Subject: [PATCH] Rename game driver to updatable driver. Game driver is considered a production name. We should use the term updatable driver instead of the production name. Bug: b/164449016 Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver Change-Id: I2237dfb22ecd94bc2475249b1460796ac1693d81 --- res/values/strings.xml | 10 +-- ...GraphicsDriverAppPreferenceController.java | 40 ++++++----- .../GraphicsDriverContentObserver.java | 2 +- .../GraphicsDriverDashboard.java | 4 +- ...rEnableForAllAppsPreferenceController.java | 57 ++++++++------- ...phicsDriverFooterPreferenceController.java | 9 +-- ...aphicsDriverGlobalSwitchBarController.java | 35 +++++----- ...hicsDriverAppPreferenceControllerTest.java | 68 ++++++++++-------- .../GraphicsDriverContentObserverTest.java | 2 +- .../GraphicsDriverDashboardTest.java | 2 +- ...bleForAllAppsPreferenceControllerTest.java | 70 ++++++++++--------- ...sDriverFooterPreferenceControllerTest.java | 20 +++--- ...csDriverGlobalSwitchBarControllerTest.java | 32 +++++---- 13 files changed, 194 insertions(+), 157 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 97462bb942c..d2cd21c3e03 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -11284,23 +11284,23 @@ Select Graphics Driver Default - - Game Driver - + + Game Driver + Developer Driver System Graphics Driver @string/graphics_driver_app_preference_default - @string/graphics_driver_app_preference_game_driver + @string/graphics_driver_app_preference_production_driver @string/graphics_driver_app_preference_prerelease_driver @string/graphics_driver_app_preference_default @string/graphics_driver_app_preference_prerelease_driver - @string/graphics_driver_app_preference_game_driver + @string/graphics_driver_app_preference_production_driver @string/graphics_driver_app_preference_system diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java index b1a31fbaec6..46a30827dae 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java @@ -16,8 +16,8 @@ package com.android.settings.development.graphicsdriver; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; import android.content.ContentResolver; import android.content.Context; @@ -62,7 +62,7 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl private final ContentResolver mContentResolver; private final String mPreferenceTitle; private final String mPreferenceDefault; - private final String mPreferenceGameDriver; + private final String mPreferenceProductionDriver; private final String mPreferencePrereleaseDriver; private final String mPreferenceSystem; @VisibleForTesting @@ -88,8 +88,8 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl final Resources resources = context.getResources(); mPreferenceTitle = resources.getString(R.string.graphics_driver_app_preference_title); mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default); - mPreferenceGameDriver = - resources.getString(R.string.graphics_driver_app_preference_game_driver); + mPreferenceProductionDriver = + resources.getString(R.string.graphics_driver_app_preference_production_driver); mPreferencePrereleaseDriver = resources.getString(R.string.graphics_driver_app_preference_prerelease_driver); mPreferenceSystem = resources.getString(R.string.graphics_driver_app_preference_system); @@ -101,19 +101,21 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl mAppInfos = getAppInfos(context); mDevOptInApps = - getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS); + getGlobalSettingsString(mContentResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS); mDevPrereleaseOptInApps = getGlobalSettingsString( - mContentResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS); + mContentResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS); mDevOptOutApps = - getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS); + getGlobalSettingsString(mContentResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS); } @Override public int getAvailabilityStatus() { return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext) && (Settings.Global.getInt(mContentResolver, - Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT) - != GAME_DRIVER_OFF) + Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT) + != UPDATABLE_DRIVER_OFF) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @@ -157,7 +159,7 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl mDevOptInApps.remove(packageName); mDevPrereleaseOptInApps.remove(packageName); mDevOptOutApps.add(packageName); - } else if (value.equals(mPreferenceGameDriver)) { + } else if (value.equals(mPreferenceProductionDriver)) { mDevOptInApps.add(packageName); mDevPrereleaseOptInApps.remove(packageName); mDevOptOutApps.remove(packageName); @@ -174,13 +176,15 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl listPref.setSummary(value); // Push the updated Sets for stable/prerelease opt-in and opt-out apps to - // corresponding Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS - Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS, + // corresponding Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_(IN|OUT)_APPS + Settings.Global.putString(mContentResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, String.join(",", mDevOptInApps)); Settings.Global.putString(mContentResolver, - Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, + Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS, String.join(",", mDevPrereleaseOptInApps)); - Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, + Settings.Global.putString(mContentResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS, String.join(",", mDevOptOutApps)); return true; @@ -251,7 +255,7 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl listPreference.setEntryValues(mEntryList); // Initialize preference default and summary with the opt in/out choices - // from Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS + // from Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_[IN|OUT]_APPS if (mDevOptOutApps.contains(packageName)) { listPreference.setValue(mPreferenceSystem); listPreference.setSummary(mPreferenceSystem); @@ -259,8 +263,8 @@ public class GraphicsDriverAppPreferenceController extends BasePreferenceControl listPreference.setValue(mPreferencePrereleaseDriver); listPreference.setSummary(mPreferencePrereleaseDriver); } else if (mDevOptInApps.contains(packageName)) { - listPreference.setValue(mPreferenceGameDriver); - listPreference.setSummary(mPreferenceGameDriver); + listPreference.setValue(mPreferenceProductionDriver); + listPreference.setSummary(mPreferenceProductionDriver); } else { listPreference.setValue(mPreferenceDefault); listPreference.setSummary(mPreferenceDefault); diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java index 83178009349..dbad0993914 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java @@ -52,7 +52,7 @@ public class GraphicsDriverContentObserver extends ContentObserver { */ public void register(ContentResolver contentResolver) { contentResolver.registerContentObserver( - Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this); + Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false, this); } /** diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java index 2801689abae..9275a31ae7b 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java @@ -30,7 +30,7 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.search.SearchIndexable; /** - * Dashboard for Game Driver preferences. + * Dashboard for Graphics Driver preferences. */ @SearchIndexable public class GraphicsDriverDashboard extends DashboardFragment { @@ -39,7 +39,7 @@ public class GraphicsDriverDashboard extends DashboardFragment { @Override public int getMetricsCategory() { - return SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD; + return SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD; } @Override diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java index 29f10149446..5106a78f726 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java @@ -46,24 +46,24 @@ import java.util.ArrayList; import java.util.List; /** - * Controller of global switch to enable Game Driver for all Apps. + * Controller of global switch to enable updatable driver for all Apps. */ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener, GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener, LifecycleObserver, OnStart, OnStop { - public static final int GAME_DRIVER_DEFAULT = 0; - public static final int GAME_DRIVER_ALL_APPS = 1; - public static final int GAME_DRIVER_PRERELEASE_ALL_APPS = 2; - public static final int GAME_DRIVER_OFF = 3; - public static final String PROPERTY_GFX_DRIVER_GAME = "ro.gfx.driver.0"; + public static final int UPDATABLE_DRIVER_DEFAULT = 0; + public static final int UPDATABLE_DRIVER_PRODUCTION_ALL_APPS = 1; + public static final int UPDATABLE_DRIVER_PRERELEASE_ALL_APPS = 2; + public static final int UPDATABLE_DRIVER_OFF = 3; + public static final String PROPERTY_GFX_DRIVER_PRODUCTION = "ro.gfx.driver.0"; public static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1"; private final Context mContext; private final ContentResolver mContentResolver; private final String mPreferenceDefault; - private final String mPreferenceGameDriver; + private final String mPreferenceProductionDriver; private final String mPreferencePrereleaseDriver; @VisibleForTesting CharSequence[] mEntryList; @@ -79,8 +79,8 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref final Resources resources = context.getResources(); mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default); - mPreferenceGameDriver = - resources.getString(R.string.graphics_driver_app_preference_game_driver); + mPreferenceProductionDriver = + resources.getString(R.string.graphics_driver_app_preference_production_driver); mPreferencePrereleaseDriver = resources.getString(R.string.graphics_driver_app_preference_prerelease_driver); mEntryList = constructEntryList(mContext, false); @@ -92,8 +92,9 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref public int getAvailabilityStatus() { return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext) && (Settings.Global.getInt(mContentResolver, - Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT) - != GAME_DRIVER_OFF) + Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT) + != UPDATABLE_DRIVER_OFF) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } @@ -122,11 +123,12 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref final ListPreference listPref = (ListPreference) preference; listPref.setVisible(isAvailable()); final int currentChoice = Settings.Global.getInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); - if (currentChoice == GAME_DRIVER_ALL_APPS) { - listPref.setValue(mPreferenceGameDriver); - listPref.setSummary(mPreferenceGameDriver); - } else if (currentChoice == GAME_DRIVER_PRERELEASE_ALL_APPS) { + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT); + if (currentChoice == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS) { + listPref.setValue(mPreferenceProductionDriver); + listPref.setSummary(mPreferenceProductionDriver); + } else if (currentChoice == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS) { listPref.setValue(mPreferencePrereleaseDriver); listPref.setSummary(mPreferencePrereleaseDriver); } else { @@ -140,21 +142,22 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref final ListPreference listPref = (ListPreference) preference; final String value = newValue.toString(); final int currentChoice = Settings.Global.getInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT); final int userChoice; - if (value.equals(mPreferenceGameDriver)) { - userChoice = GAME_DRIVER_ALL_APPS; + if (value.equals(mPreferenceProductionDriver)) { + userChoice = UPDATABLE_DRIVER_PRODUCTION_ALL_APPS; } else if (value.equals(mPreferencePrereleaseDriver)) { - userChoice = GAME_DRIVER_PRERELEASE_ALL_APPS; + userChoice = UPDATABLE_DRIVER_PRERELEASE_ALL_APPS; } else { - userChoice = GAME_DRIVER_DEFAULT; + userChoice = UPDATABLE_DRIVER_DEFAULT; } listPref.setValue(value); listPref.setSummary(value); if (userChoice != currentChoice) { Settings.Global.putInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, userChoice); + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, userChoice); } return true; @@ -172,7 +175,8 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref final Resources resources = context.getResources(); final String prereleaseDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_PRERELEASE); - final String gameDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_GAME); + final String productionDriverPackageName = + SystemProperties.get(PROPERTY_GFX_DRIVER_PRODUCTION); List entryList = new ArrayList<>(); entryList.add(resources.getString(R.string.graphics_driver_app_preference_default)); @@ -182,9 +186,10 @@ public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePref entryList.add(resources.getString( R.string.graphics_driver_app_preference_prerelease_driver)); } - if (!TextUtils.isEmpty(gameDriverPackageName) - && hasDriverPackage(pm, gameDriverPackageName)) { - entryList.add(resources.getString(R.string.graphics_driver_app_preference_game_driver)); + if (!TextUtils.isEmpty(productionDriverPackageName) + && hasDriverPackage(pm, productionDriverPackageName)) { + entryList.add(resources.getString( + R.string.graphics_driver_app_preference_production_driver)); } if (withSystem) { entryList.add(resources.getString(R.string.graphics_driver_app_preference_system)); diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java index 4862cfe03a2..5595f390fe7 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java @@ -16,8 +16,8 @@ package com.android.settings.development.graphicsdriver; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; import android.content.ContentResolver; import android.content.Context; @@ -58,8 +58,9 @@ public class GraphicsDriverFooterPreferenceController extends BasePreferenceCont @Override public int getAvailabilityStatus() { return Settings.Global.getInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT) - == GAME_DRIVER_OFF + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT) + == UPDATABLE_DRIVER_OFF ? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE; } diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java index 86c56b7daab..b1faefa5ca4 100644 --- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java +++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java @@ -16,10 +16,10 @@ package com.android.settings.development.graphicsdriver; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS; import android.content.ContentResolver; import android.content.Context; @@ -36,7 +36,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.development.DevelopmentSettingsEnabler; /** - * Controller of global switch bar used to fully turn off Game Driver. + * Controller of global switch bar used to fully turn off updatable driver. */ public class GraphicsDriverGlobalSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener, @@ -61,8 +61,9 @@ public class GraphicsDriverGlobalSwitchBarController DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)); mSwitchWidgetController.setChecked( Settings.Global.getInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT) - != GAME_DRIVER_OFF); + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT) + != UPDATABLE_DRIVER_OFF); mSwitchWidgetController.setListener(this); } @@ -81,21 +82,22 @@ public class GraphicsDriverGlobalSwitchBarController @Override public boolean onSwitchToggled(boolean isChecked) { final int graphicsDriverGlobalOption = Settings.Global.getInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT); if (isChecked - && (graphicsDriverGlobalOption == GAME_DRIVER_DEFAULT - || graphicsDriverGlobalOption == GAME_DRIVER_ALL_APPS - || graphicsDriverGlobalOption == GAME_DRIVER_PRERELEASE_ALL_APPS)) { + && (graphicsDriverGlobalOption == UPDATABLE_DRIVER_DEFAULT + || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS + || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS)) { return true; } - if (!isChecked && graphicsDriverGlobalOption == GAME_DRIVER_OFF) { + if (!isChecked && graphicsDriverGlobalOption == UPDATABLE_DRIVER_OFF) { return true; } - Settings.Global.putInt(mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, - isChecked ? GAME_DRIVER_DEFAULT : GAME_DRIVER_OFF); + Settings.Global.putInt(mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + isChecked ? UPDATABLE_DRIVER_DEFAULT : UPDATABLE_DRIVER_OFF); return true; } @@ -104,7 +106,8 @@ public class GraphicsDriverGlobalSwitchBarController public void onGraphicsDriverContentChanged() { mSwitchWidgetController.setChecked( Settings.Global.getInt( - mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT) - != GAME_DRIVER_OFF); + mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT) + != UPDATABLE_DRIVER_OFF); } } diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java index 372daf0cc95..2266ed9765c 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java @@ -18,8 +18,8 @@ package com.android.settings.development.graphicsdriver; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.google.common.truth.Truth.assertThat; @@ -57,7 +57,7 @@ public class GraphicsDriverAppPreferenceControllerTest { private static final int DEFAULT = 0; private static final int PRERELEASE_DRIVER = 1; - private static final int GAME_DRIVER = 2; + private static final int PRODUCTION_DRIVER = 2; private static final int SYSTEM = 3; private static final String TEST_APP_NAME = "testApp"; private static final String TEST_PKG_NAME = "testPkg"; @@ -99,11 +99,11 @@ public class GraphicsDriverAppPreferenceControllerTest { } @Test - public void getAvailability_developmentSettingsEnabledAndGameDriverOn_available() { + public void getAvailability_developmentSettingsEnabledAndProductionDriverOn_available() { loadDefaultConfig(); Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @@ -119,7 +119,8 @@ public class GraphicsDriverAppPreferenceControllerTest { @Test public void getAvailability_graphicsDriverOff_conditionallyUnavailable() { loadDefaultConfig(); - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @@ -157,7 +158,7 @@ public class GraphicsDriverAppPreferenceControllerTest { public void updateState_available_visible() { Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); loadDefaultConfig(); assertThat(mGroup.isVisible()).isTrue(); @@ -165,7 +166,8 @@ public class GraphicsDriverAppPreferenceControllerTest { @Test public void updateState_graphicsDriverOff_notVisible() { - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); loadDefaultConfig(); assertThat(mGroup.isVisible()).isFalse(); @@ -188,7 +190,7 @@ public class GraphicsDriverAppPreferenceControllerTest { } @Test - public void createPreference_configGAME_DRIVER_shouldSetGameDriverAttributes() { + public void createPreference_configProduction_DRIVER_shouldSetProductionDriverAttributes() { loadConfig(TEST_PKG_NAME, "", ""); final ListPreference preference = mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME); @@ -198,9 +200,9 @@ public class GraphicsDriverAppPreferenceControllerTest { assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle); assertThat(preference.getEntries()).isEqualTo(mValueList); assertThat(preference.getEntryValues()).isEqualTo(mValueList); - assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]); - assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]); - assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]); + assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]); + assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]); + assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]); } @Test @@ -245,9 +247,11 @@ public class GraphicsDriverAppPreferenceControllerTest { assertThat(preference.getEntry()).isEqualTo(mValueList[DEFAULT]); assertThat(preference.getValue()).isEqualTo(mValueList[DEFAULT]); assertThat(preference.getSummary()).isEqualTo(mValueList[DEFAULT]); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS)) + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS)) .isEqualTo(""); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS)) + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS)) .isEqualTo(""); } @@ -262,25 +266,28 @@ public class GraphicsDriverAppPreferenceControllerTest { assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]); assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]); assertThat(Settings.Global.getString(mResolver, - Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS)) + Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS)) .isEqualTo(TEST_PKG_NAME); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS)) + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS)) .isEqualTo(""); } @Test - public void onPreferenceChange_selectGAME_DRIVER_shouldUpdateAttributesAndSettingsGlobal() { + public void onPreferenceChange_selectPRODUCTION_DRIVER_shouldUpdateAttrAndSettingsGlobal() { loadDefaultConfig(); final ListPreference preference = mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME); - mController.onPreferenceChange(preference, mValueList[GAME_DRIVER]); + mController.onPreferenceChange(preference, mValueList[PRODUCTION_DRIVER]); - assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]); - assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]); - assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS)) + assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]); + assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]); + assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]); + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS)) .isEqualTo(TEST_PKG_NAME); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS)) + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS)) .isEqualTo(""); } @@ -294,9 +301,11 @@ public class GraphicsDriverAppPreferenceControllerTest { assertThat(preference.getEntry()).isEqualTo(mValueList[SYSTEM]); assertThat(preference.getValue()).isEqualTo(mValueList[SYSTEM]); assertThat(preference.getSummary()).isEqualTo(mValueList[SYSTEM]); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS)) + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS)) .isEqualTo(""); - assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS)) + assertThat(Settings.Global.getString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS)) .isEqualTo(TEST_PKG_NAME); } @@ -320,10 +329,13 @@ public class GraphicsDriverAppPreferenceControllerTest { } private void loadConfig(String optIn, String prereleaseOptIn, String optOut) { - Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS, optIn); + Settings.Global.putString(mResolver, + Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, optIn); Settings.Global.putString( - mResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, prereleaseOptIn); - Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut); + mResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS, + prereleaseOptIn); + Settings.Global.putString( + mResolver, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS, optOut); mController = new GraphicsDriverAppPreferenceController(mContext, "testKey"); mController.mEntryList = mContext.getResources().getStringArray( diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java index b6bf4a79a8a..4beca0b254c 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java @@ -58,7 +58,7 @@ public class GraphicsDriverContentObserverTest { mGraphicsDriverContentObserver.register(mResolver); verify(mResolver).registerContentObserver( - Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, + Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false, mGraphicsDriverContentObserver); } diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java index 838f47be660..df8a438603b 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java @@ -45,7 +45,7 @@ public class GraphicsDriverDashboardTest { @Test public void getMetricesCategory_shouldReturnGraphicsDriverDashboard() { assertThat(mDashboard.getMetricsCategory()) - .isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD); + .isEqualTo(SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD); } @Test diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java index 920e9d1506f..e24b9e565ca 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java @@ -18,10 +18,10 @@ package com.android.settings.development.graphicsdriver; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS; import static com.google.common.truth.Truth.assertThat; @@ -61,7 +61,7 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { private ContentResolver mResolver; private GraphicsDriverEnableForAllAppsPreferenceController mController; private String mPreferenceDefault; - private String mPreferenceGameDriver; + private String mPreferenceProductionDriver; private String mPreferencePrereleaseDriver; @Before @@ -72,14 +72,14 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { final Resources resources = mContext.getResources(); mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default); - mPreferenceGameDriver = - resources.getString(R.string.graphics_driver_app_preference_game_driver); + mPreferenceProductionDriver = + resources.getString(R.string.graphics_driver_app_preference_production_driver); mPreferencePrereleaseDriver = resources.getString(R.string.graphics_driver_app_preference_prerelease_driver); Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); mController = new GraphicsDriverEnableForAllAppsPreferenceController(mContext, "testKey"); mController.mEntryList = mContext.getResources().getStringArray( @@ -89,9 +89,9 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { } @Test - public void getAvailability_developmentSettingsEnabledAndGameDriverSettingsOn_available() { + public void getAvailability_developmentSettingsEnabledAndUpdatableDriverSettingsOn_available() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @@ -104,8 +104,9 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { } @Test - public void getAvailability_gameDriverOff_conditionallyUnavailable() { - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + public void getAvailability_updatableDriverOff_conditionallyUnavailable() { + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @@ -113,7 +114,7 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { @Test public void displayPreference_shouldAddListPreference() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); mController.updateState(mPreference); verify(mPreference).setValue(mPreferenceDefault); @@ -139,7 +140,7 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { @Test public void updateState_availableAndDefault_visibleAndDefault() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); mController.updateState(mPreference); verify(mPreference, atLeastOnce()).setVisible(true); @@ -148,20 +149,22 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { } @Test - public void updateState_availableAndGameDriver_visibleAndGameDriver() { + public void updateState_availableAndProductionDriver_visibleAndProductionDriver() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_PRODUCTION_ALL_APPS); mController.updateState(mPreference); verify(mPreference, atLeastOnce()).setVisible(true); - verify(mPreference).setValue(mPreferenceGameDriver); - verify(mPreference).setSummary(mPreferenceGameDriver); + verify(mPreference).setValue(mPreferenceProductionDriver); + verify(mPreference).setSummary(mPreferenceProductionDriver); } @Test public void updateState_availableAndPrereleaseDriver_visibleAndPrereleaseDriver() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_PRERELEASE_ALL_APPS); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_PRERELEASE_ALL_APPS); mController.updateState(mPreference); verify(mPreference, atLeastOnce()).setVisible(true); @@ -170,8 +173,9 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { } @Test - public void updateState_gameDriverOff_notVisibleAndSystemDriver() { - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + public void updateState_updatableDriverOff_notVisibleAndSystemDriver() { + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); mController.updateState(mPreference); verify(mPreference).setVisible(false); @@ -182,33 +186,35 @@ public class GraphicsDriverEnableForAllAppsPreferenceControllerTest { @Test public void onPreferenceChange_default_shouldUpdateSettingsGlobal() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_PRODUCTION_ALL_APPS); mController.onPreferenceChange(mPreference, mPreferenceDefault); assertThat(Settings.Global.getInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)) - .isEqualTo(GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT)) + .isEqualTo(UPDATABLE_DRIVER_DEFAULT); } @Test - public void onPreferenceChange_gameDriver_shouldUpdateSettingsGlobal() { + public void onPreferenceChange_updatableDriver_shouldUpdateSettingsGlobal() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); - mController.onPreferenceChange(mPreference, mPreferenceGameDriver); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); + mController.onPreferenceChange(mPreference, mPreferenceProductionDriver); assertThat(Settings.Global.getInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)) - .isEqualTo(GAME_DRIVER_ALL_APPS); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT)) + .isEqualTo(UPDATABLE_DRIVER_PRODUCTION_ALL_APPS); } @Test public void onPreferenceChange_prereleaseDriver_shouldUpdateSettingsGlobal() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); mController.onPreferenceChange(mPreference, mPreferencePrereleaseDriver); assertThat(Settings.Global.getInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)) - .isEqualTo(GAME_DRIVER_PRERELEASE_ALL_APPS); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT)) + .isEqualTo(UPDATABLE_DRIVER_PRERELEASE_ALL_APPS); } } diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java index a2d23b6b4cb..1e4c4968c2b 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java @@ -18,9 +18,9 @@ package com.android.settings.development.graphicsdriver; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS; import static com.google.common.truth.Truth.assertThat; @@ -68,24 +68,26 @@ public class GraphicsDriverFooterPreferenceControllerTest { } @Test - public void getAvailabilityStatus_gameDriverOff_availableUnsearchable() { - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + public void getAvailabilityStatus_updatableDriverOff_availableUnsearchable() { + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE); } @Test - public void getAvailabilityStatus_gameDriverDefault_conditionallyUnavailable() { + public void getAvailabilityStatus_updatableDriverDefault_conditionallyUnavailable() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } @Test - public void getAvailabilityStatus_gameDriverAllApps_conditionallyUnavailable() { + public void getAvailabilityStatus_updatableProductionDriverAllApps_conditionallyUnavailable() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_PRODUCTION_ALL_APPS); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java index 7d4ee45adeb..838703d3381 100644 --- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java @@ -16,8 +16,8 @@ package com.android.settings.development.graphicsdriver; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; -import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT; +import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF; import static com.google.common.truth.Truth.assertThat; @@ -61,9 +61,9 @@ public class GraphicsDriverGlobalSwitchBarControllerTest { } @Test - public void constructor_gameDriverOn_shouldCheckSwitchBar() { + public void constructor_updatableDriverOn_shouldCheckSwitchBar() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); mController = new GraphicsDriverGlobalSwitchBarController( mContext, new SwitchBarController(mSwitchBar)); @@ -71,8 +71,9 @@ public class GraphicsDriverGlobalSwitchBarControllerTest { } @Test - public void constructor_gameDriverOff_shouldUncheckSwitchBar() { - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + public void constructor_updatableDriverOff_shouldUncheckSwitchBar() { + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); mController = new GraphicsDriverGlobalSwitchBarController( mContext, new SwitchBarController(mSwitchBar)); @@ -122,27 +123,30 @@ public class GraphicsDriverGlobalSwitchBarControllerTest { } @Test - public void onSwitchToggled_checked_shouldTurnOnGameDriver() { - Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); + public void onSwitchToggled_checked_shouldTurnOnUpdatableDriver() { + Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_OFF); mController = new GraphicsDriverGlobalSwitchBarController( mContext, new SwitchBarController(mSwitchBar)); mController.onSwitchToggled(true); assertThat(Settings.Global.getInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)) - .isEqualTo(GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT)) + .isEqualTo(UPDATABLE_DRIVER_DEFAULT); } @Test - public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() { + public void onSwitchToggled_unchecked_shouldTurnOffUpdatableDriver() { Settings.Global.putInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT); mController = new GraphicsDriverGlobalSwitchBarController( mContext, new SwitchBarController(mSwitchBar)); mController.onSwitchToggled(false); assertThat(Settings.Global.getInt( - mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)) - .isEqualTo(GAME_DRIVER_OFF); + mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, + UPDATABLE_DRIVER_DEFAULT)) + .isEqualTo(UPDATABLE_DRIVER_OFF); } }