[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours am: b372e3fbcf -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1417618
Change-Id: Ie0228bd344d0b755ccc745109a2369331d15b622
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 97462bb..d2cd21c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11284,23 +11284,23 @@
<string name="graphics_driver_app_preference_title">Select Graphics Driver</string>
<!-- The default value of graphics driver preference for app [CHAR LIMIT=50] -->
<string name="graphics_driver_app_preference_default">Default</string>
- <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->
- <string name="graphics_driver_app_preference_game_driver">Game Driver</string>
- <!-- The prerelase driver value for Developer Driver app preference [CHAR LIMIT=50] -->
+ <!-- The value for updatable production driver app preference [CHAR LIMIT=50] -->
+ <string name="graphics_driver_app_preference_production_driver">Game Driver</string>
+ <!-- The value for updatable developer driver app preference [CHAR LIMIT=50] -->
<string name="graphics_driver_app_preference_prerelease_driver">Developer Driver</string>
<!-- The system driver value for system graphics driver app preference [CHAR LIMIT=50] -->
<string name="graphics_driver_app_preference_system">System Graphics Driver</string>
<!-- All the graphics driver preference values for all apps globally [CHAR LIMIT=50] -->
<string-array name="graphics_driver_all_apps_preference_values">
<item>@string/graphics_driver_app_preference_default</item>
- <item>@string/graphics_driver_app_preference_game_driver</item>
+ <item>@string/graphics_driver_app_preference_production_driver</item>
<item>@string/graphics_driver_app_preference_prerelease_driver</item>
</string-array>
<!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->
<string-array name="graphics_driver_app_preference_values">
<item>@string/graphics_driver_app_preference_default</item>
<item>@string/graphics_driver_app_preference_prerelease_driver</item>
- <item>@string/graphics_driver_app_preference_game_driver</item>
+ <item>@string/graphics_driver_app_preference_production_driver</item>
<item>@string/graphics_driver_app_preference_system</item>
</string-array>
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
index b1a31fb..46a3082 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 8317800..dbad099 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
@@ -52,7 +52,7 @@
*/
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 2801689..9275a31 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.search.SearchIndexable;
/**
- * Dashboard for Game Driver preferences.
+ * Dashboard for Graphics Driver preferences.
*/
@SearchIndexable
public class GraphicsDriverDashboard extends DashboardFragment {
@@ -39,7 +39,7 @@
@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 29f1014..5106a78 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.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 @@
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 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 @@
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 @@
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 @@
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<CharSequence> entryList = new ArrayList<>();
entryList.add(resources.getString(R.string.graphics_driver_app_preference_default));
@@ -182,9 +186,10 @@
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 4862cfe..5595f39 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 @@
@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 86c56b7..b1faefa 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.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 @@
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 @@
@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 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/src/com/android/settings/network/telephony/TelephonyConstants.java b/src/com/android/settings/network/telephony/TelephonyConstants.java
index 30cd568..78a177e 100644
--- a/src/com/android/settings/network/telephony/TelephonyConstants.java
+++ b/src/com/android/settings/network/telephony/TelephonyConstants.java
@@ -18,8 +18,6 @@
import android.telephony.TelephonyManager;
-import android.telephony.TelephonyManager;
-
/**
* Contains hidden constants copied from the platform.
*/
@@ -211,6 +209,12 @@
* Copied from {@link android.telephony.RadioAccessFamily}
*/
public static class RadioAccessFamily {
+ /**
+ * TODO: get rid of RAF definition in RadioAccessFamily and
+ * use {@link TelephonyManager.NetworkTypeBitMask}
+ * TODO: public definition {@link TelephonyManager.NetworkTypeBitMask} is long.
+ * TODO: Convert from int * to long everywhere including HAL definitions.
+ */
// 2G
public static final int RAF_UNKNOWN = (int) TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;
public static final int RAF_GSM = (int) TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
@@ -246,9 +250,7 @@
public static final int WCDMA = HS | RAF_UMTS;
// 4G
public static final int LTE = RAF_LTE | RAF_LTE_CA;
-
// 5G
public static final int NR = RAF_NR;
-
}
}
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index fecbec1..6b491e5 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -69,8 +69,8 @@
],
libs: [
+ "framework-wifi.impl",
"ims-common",
- "telephony-common",
],
java_resource_dirs: ["config", "resources"],
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 372daf0..2266ed9 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 @@
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 @@
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 @@
}
@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 @@
@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 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 @@
@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 @@
}
@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 @@
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 @@
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 @@
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 @@
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 @@
}
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 b6bf4a7..4beca0b 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 @@
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 838f47b..df8a438 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 @@
@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 920e9d1..e24b9e5 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 @@
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 @@
private ContentResolver mResolver;
private GraphicsDriverEnableForAllAppsPreferenceController mController;
private String mPreferenceDefault;
- private String mPreferenceGameDriver;
+ private String mPreferenceProductionDriver;
private String mPreferencePrereleaseDriver;
@Before
@@ -72,14 +72,14 @@
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 @@
}
@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 @@
}
@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 @@
@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 @@
@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 @@
}
@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 @@
}
@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 @@
@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 a2d23b6..1e4c496 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 @@
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 @@
}
@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 7d4ee45..838703d 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 @@
}
@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 @@
}
@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 @@
}
@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);
}
}