Merge "Rename GameDriver* to GraphicsDriver*." (9ccbadeb) · Commits · e / os / android_packages_apps_Settings

res/xml/development_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@
		android:key="graphics_driver_dashboard"
		android:title="@string/graphics_driver_dashboard_title"
		android:summary="@string/graphics_driver_dashboard_summary"
		android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard" />
		android:fragment="com.android.settings.development.graphicsdriver.GraphicsDriverDashboard" />

		<Preference
		android:key="platform_compat_dashboard"

res/xml/graphics_driver_settings.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -26,20 +26,20 @@
		android:dialogTitle="@string/graphics_driver_all_apps_preference_title"
		android:entries="@array/graphics_driver_all_apps_preference_values"
		android:entryValues="@array/graphics_driver_all_apps_preference_values"
		settings:controller="com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController">
		settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController">
		</ListPreference>

		<PreferenceCategory
		android:key="graphics_driver_category"
		android:title="@string/graphics_driver_app_preference_title"
		settings:controller="com.android.settings.development.gamedriver.GameDriverAppPreferenceController">
		settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverAppPreferenceController">
		</PreferenceCategory>

		<com.android.settingslib.widget.FooterPreference
		android:key="graphics_driver_footer"
		android:title="@string/graphics_driver_footer_text"
		android:selectable="false"
		settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController">
		settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverFooterPreferenceController">
		</com.android.settingslib.widget.FooterPreference>

		</PreferenceScreen>

src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java→src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java

+17 −17

Original line number	Diff line number	Diff line
		@@ -14,10 +14,10 @@
		* limitations under the License.
		*/

		package com.android.settings.development.gamedriver;
		package com.android.settings.development.graphicsdriver;

		import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
		import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
		import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
		import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;

		import android.content.ContentResolver;
		import android.content.Context;
		@@ -53,9 +53,9 @@ import java.util.Set;
		/**
		* Controller of all the per App based list preferences.
		*/
		public class GameDriverAppPreferenceController extends BasePreferenceController
		public class GraphicsDriverAppPreferenceController extends BasePreferenceController
		implements Preference.OnPreferenceChangeListener,
		GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
		GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener, LifecycleObserver,
		OnStart, OnStop {

		private final Context mContext;
		@@ -67,7 +67,7 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
		private final String mPreferencePrereleaseDriver;
		private final String mPreferenceSystem;
		@VisibleForTesting
		GameDriverContentObserver mGameDriverContentObserver;
		GraphicsDriverContentObserver mGraphicsDriverContentObserver;

		private final List<AppInfo> mAppInfos;
		private final Set<String> mDevOptInApps;
		@@ -76,13 +76,13 @@ public class GameDriverAppPreferenceController extends BasePreferenceController

		private PreferenceGroup mPreferenceGroup;

		public GameDriverAppPreferenceController(Context context, String key) {
		public GraphicsDriverAppPreferenceController(Context context, String key) {
		super(context, key);

		mContext = context;
		mContentResolver = context.getContentResolver();
		mGameDriverContentObserver =
		new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
		mGraphicsDriverContentObserver =
		new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);

		final Resources resources = context.getResources();
		mEntryList = resources.getStringArray(R.array.graphics_driver_app_preference_values);
		@@ -130,12 +130,12 @@ public class GameDriverAppPreferenceController extends BasePreferenceController

		@Override
		public void onStart() {
		mGameDriverContentObserver.register(mContentResolver);
		mGraphicsDriverContentObserver.register(mContentResolver);
		}

		@Override
		public void onStop() {
		mGameDriverContentObserver.unregister(mContentResolver);
		mGraphicsDriverContentObserver.unregister(mContentResolver);
		}

		@Override
		@@ -185,7 +185,7 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
		}

		@Override
		public void onGameDriverContentChanged() {
		public void onGraphicsDriverContentChanged() {
		updateState(mPreferenceGroup);
		}

		@@ -196,8 +196,8 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
		label = packageManager.getApplicationLabel(applicationInfo).toString();
		}

		final ApplicationInfo info;
		final String label;
		public final ApplicationInfo info;
		public final String label;
		}

		// List of non-system packages that are installed for the current user.
		@@ -213,7 +213,7 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
		}
		}

		Collections.sort(appInfos, appInfoComparator);
		Collections.sort(appInfos, mAppInfoComparator);

		return appInfos;
		}
		@@ -231,8 +231,8 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
		return valueSet;
		}

		private final Comparator<AppInfo> appInfoComparator = new Comparator<AppInfo>() {
		public final int compare(AppInfo a, AppInfo b) {
		private final Comparator<AppInfo> mAppInfoComparator = new Comparator<AppInfo>() {
		public int compare(AppInfo a, AppInfo b) {
		return Collator.getInstance().compare(a.label, b.label);
		}
		};

src/com/android/settings/development/gamedriver/GameDriverContentObserver.java→src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java

+15 −8

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.settings.development.gamedriver;
		package com.android.settings.development.graphicsdriver;

		import android.content.ContentResolver;
		import android.database.ContentObserver;
		@@ -24,18 +24,19 @@ import android.provider.Settings;
		import androidx.annotation.VisibleForTesting;

		/**
		* Helper class to observe Game Driver settings global change.
		* Helper class to observe Graphics Driver settings global change.
		*/
		public class GameDriverContentObserver extends ContentObserver {
		public class GraphicsDriverContentObserver extends ContentObserver {

		interface OnGameDriverContentChangedListener {
		void onGameDriverContentChanged();
		interface OnGraphicsDriverContentChangedListener {
		void onGraphicsDriverContentChanged();
		}

		@VisibleForTesting
		OnGameDriverContentChangedListener mListener;
		OnGraphicsDriverContentChangedListener mListener;

		public GameDriverContentObserver(Handler handler, OnGameDriverContentChangedListener listener) {
		public GraphicsDriverContentObserver(Handler handler,
		OnGraphicsDriverContentChangedListener listener) {
		super(handler);
		mListener = listener;
		}
		@@ -43,14 +44,20 @@ public class GameDriverContentObserver extends ContentObserver {
		@Override
		public void onChange(boolean selfChange) {
		super.onChange(selfChange);
		mListener.onGameDriverContentChanged();
		mListener.onGraphicsDriverContentChanged();
		}

		/**
		* Register GraphicsDriverContentObserver to ContentResolver.
		*/
		public void register(ContentResolver contentResolver) {
		contentResolver.registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
		}

		/**
		* Unregister GraphicsDriverContentObserver.
		*/
		public void unregister(ContentResolver contentResolver) {
		contentResolver.unregisterContentObserver(this);
		}

src/com/android/settings/development/gamedriver/GameDriverDashboard.java→src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.settings.development.gamedriver;
		package com.android.settings.development.graphicsdriver;

		import android.app.settings.SettingsEnums;
		import android.content.Context;
		@@ -33,9 +33,9 @@ import com.android.settingslib.search.SearchIndexable;
		* Dashboard for Game Driver preferences.
		*/
		@SearchIndexable
		public class GameDriverDashboard extends DashboardFragment {
		public class GraphicsDriverDashboard extends DashboardFragment {

		private static final String TAG = "GameDriverDashboard";
		private static final String TAG = "GraphicsDriverDashboard";

		@Override
		public int getMetricsCategory() {
		@@ -63,8 +63,8 @@ public class GameDriverDashboard extends DashboardFragment {

		final SettingsActivity activity = (SettingsActivity) getActivity();
		final SwitchBar switchBar = activity.getSwitchBar();
		final GameDriverGlobalSwitchBarController switchBarController =
		new GameDriverGlobalSwitchBarController(
		final GraphicsDriverGlobalSwitchBarController switchBarController =
		new GraphicsDriverGlobalSwitchBarController(
		activity, new SwitchBarController(switchBar));
		getSettingsLifecycle().addObserver(switchBarController);
		switchBar.show();