Merge "Rename game driver to updatable driver." into rvc-dev-plus-aosp (60e33309) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -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>

src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java

+22 −18

Original line number	Diff line number	Diff line
		@@ -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);

src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**

src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java

+31 −26

Original line number	Diff line number	Diff line
		@@ -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<CharSequence> 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));