PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename GameDriver* to GraphicsDriver*.

Browse Source 
To make graphics driver selection more generic, rename GameDriver
specific classes to GraphicsDriver.

Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GraphicsDriver
Change-Id: If2780b32e2826bda56de11734736260f916182d0
This commit is contained in:
Peiyong Lin
2020-02-11 11:03:13 -08:00
parent 9368270fe2
commit 4e89f929d7
14 changed files with 162 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
};

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

@@ -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);
}

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

@@ -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();

22
src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceController.java → src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
View File

@@ -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.content.Context;
@@ -38,10 +38,10 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
/**
* Controller of global switch to enable Game Driver for all Apps.
*/
public class GameDriverEnableForAllAppsPreferenceController extends BasePreferenceController
public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
LifecycleObserver, OnStart, OnStop {
public static final int GAME_DRIVER_DEFAULT = 0;
public static final int GAME_DRIVER_ALL_APPS = 1;
@@ -54,11 +54,11 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
private final String mPreferenceGameDriver;
private final String mPreferencePrereleaseDriver;
@VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver;
GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private ListPreference mPreference;
public GameDriverEnableForAllAppsPreferenceController(Context context, String key) {
public GraphicsDriverEnableForAllAppsPreferenceController(Context context, String key) {
super(context, key);
mContext = context;
mContentResolver = context.getContentResolver();
@@ -69,8 +69,8 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
resources.getString(R.string.graphics_driver_app_preference_game_driver);
mPreferencePrereleaseDriver =
resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
mGameDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
mGraphicsDriverContentObserver =
new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
}
@Override
@@ -92,12 +92,12 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
@Override
public void onStart() {
mGameDriverContentObserver.register(mContentResolver);
mGraphicsDriverContentObserver.register(mContentResolver);
}
@Override
public void onStop() {
mGameDriverContentObserver.unregister(mContentResolver);
mGraphicsDriverContentObserver.unregister(mContentResolver);
}
@Override
@@ -144,7 +144,7 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
}
@Override
public void onGameDriverContentChanged() {
public void onGraphicsDriverContentChanged() {
updateState(mPreference);
}
}

28
src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java → src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
View File

@@ -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;
@@ -35,23 +35,23 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.FooterPreference;
/**
* Controller of footer preference for Game Driver.
* Controller of footer preference for Graphics Driver Preferences dashboard.
*/
public class GameDriverFooterPreferenceController extends BasePreferenceController
implements GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
public class GraphicsDriverFooterPreferenceController extends BasePreferenceController
implements GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
LifecycleObserver, OnStart, OnStop {
private final ContentResolver mContentResolver;
@VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver;
GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private FooterPreference mPreference;
public GameDriverFooterPreferenceController(Context context, String key) {
public GraphicsDriverFooterPreferenceController(Context context, String key) {
super(context, key);
mContentResolver = context.getContentResolver();
mGameDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
mGraphicsDriverContentObserver =
new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
}
@Override
@@ -71,16 +71,16 @@ public class GameDriverFooterPreferenceController extends BasePreferenceControll
@Override
public void onStart() {
mGameDriverContentObserver.register(mContentResolver);
mGraphicsDriverContentObserver.register(mContentResolver);
}
@Override
public void onStop() {
mGameDriverContentObserver.unregister(mContentResolver);
mGraphicsDriverContentObserver.unregister(mContentResolver);
}
@Override
public void onGameDriverContentChanged() {
public void onGraphicsDriverContentChanged() {
updateState(mPreference);
}
}

39
src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarController.java → src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
View File

@@ -14,12 +14,12 @@
* 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_ALL_APPS;
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.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
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 android.content.ContentResolver;
import android.content.Context;
@@ -38,24 +38,24 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
/**
* Controller of global switch bar used to fully turn off Game Driver.
*/
public class GameDriverGlobalSwitchBarController
public class GraphicsDriverGlobalSwitchBarController
implements SwitchWidgetController.OnSwitchChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
LifecycleObserver, OnStart, OnStop {
private final Context mContext;
private final ContentResolver mContentResolver;
@VisibleForTesting
SwitchWidgetController mSwitchWidgetController;
@VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver;
GraphicsDriverContentObserver mGraphicsDriverContentObserver;
GameDriverGlobalSwitchBarController(
GraphicsDriverGlobalSwitchBarController(
Context context, SwitchWidgetController switchWidgetController) {
mContext = context;
mContentResolver = context.getContentResolver();
mGameDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
mGraphicsDriverContentObserver =
new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
mSwitchWidgetController = switchWidgetController;
mSwitchWidgetController.setEnabled(
DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
@@ -69,27 +69,28 @@ public class GameDriverGlobalSwitchBarController
@Override
public void onStart() {
mSwitchWidgetController.startListening();
mGameDriverContentObserver.register(mContentResolver);
mGraphicsDriverContentObserver.register(mContentResolver);
}
@Override
public void onStop() {
mSwitchWidgetController.stopListening();
mGameDriverContentObserver.unregister(mContentResolver);
mGraphicsDriverContentObserver.unregister(mContentResolver);
}
@Override
public boolean onSwitchToggled(boolean isChecked) {
final int gameDriver = Settings.Global.getInt(
final int graphicsDriverGlobalOption = Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
if (isChecked
&& (gameDriver == GAME_DRIVER_DEFAULT || gameDriver == GAME_DRIVER_ALL_APPS
|| gameDriver == GAME_DRIVER_PRERELEASE_ALL_APPS)) {
&& (graphicsDriverGlobalOption == GAME_DRIVER_DEFAULT
|| graphicsDriverGlobalOption == GAME_DRIVER_ALL_APPS
|| graphicsDriverGlobalOption == GAME_DRIVER_PRERELEASE_ALL_APPS)) {
return true;
}
if (!isChecked && gameDriver == GAME_DRIVER_OFF) {
if (!isChecked && graphicsDriverGlobalOption == GAME_DRIVER_OFF) {
return true;
}
@@ -100,7 +101,7 @@ public class GameDriverGlobalSwitchBarController
}
@Override
public void onGameDriverContentChanged() {
public void onGraphicsDriverContentChanged() {
mSwitchWidgetController.setChecked(
Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)