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

Game Driver: rename GUP to Game Driver

Browse Source 
Bug: 119221883
Test: make RunSettingsRoboTests
Change-Id: Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9
This commit is contained in:
Yiwei Zhang
2019-01-24 14:04:58 -08:00
parent 8aa568f1f5
commit bf854fc41b
15 changed files with 249 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/com/android/settings/development/gup/GupPreferenceController.java → src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.android.settings.development.gup;
package com.android.settings.development.gamedriver;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import android.content.ContentResolver;
import android.content.Context;
@@ -53,16 +53,17 @@ import java.util.Set;
/**
* Controller of all the per App based list preferences.
*/
public class GupPreferenceController extends BasePreferenceController
public class GameDriverAppPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
private final Context mContext;
private final ContentResolver mContentResolver;
private final CharSequence[] mEntryList;
private final String mPreferenceTitle;
private final String mPreferenceDefault;
private final String mPreferenceGup;
private final String mPreferenceGameDriver;
private final String mPreferenceSystem;
@VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver;
@@ -73,7 +74,7 @@ public class GupPreferenceController extends BasePreferenceController
private PreferenceGroup mPreferenceGroup;
public GupPreferenceController(Context context, String key) {
public GameDriverAppPreferenceController(Context context, String key) {
super(context, key);
mContext = context;
@@ -82,28 +83,29 @@ public class GupPreferenceController extends BasePreferenceController
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
final Resources resources = context.getResources();
mEntryList = resources.getStringArray(R.array.gup_app_preference_values);
mPreferenceTitle = resources.getString(R.string.gup_app_preference_title);
mPreferenceDefault = resources.getString(R.string.gup_app_preference_default);
mPreferenceGup = resources.getString(R.string.gup_app_preference_gup);
mPreferenceSystem = resources.getString(R.string.gup_app_preference_system);
mEntryList = resources.getStringArray(R.array.game_driver_app_preference_values);
mPreferenceTitle = resources.getString(R.string.game_driver_app_preference_title);
mPreferenceDefault = resources.getString(R.string.game_driver_app_preference_default);
mPreferenceGameDriver =
resources.getString(R.string.game_driver_app_preference_game_driver);
mPreferenceSystem = resources.getString(R.string.game_driver_app_preference_system);
// TODO: Move this task to background if there's potential ANR/Jank.
// Update the UI when all the app infos are ready.
mAppInfos = getAppInfos(context);
mDevOptInApps =
getGlobalSettingsString(mContentResolver, Settings.Global.GUP_DEV_OPT_IN_APPS);
getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS);
mDevOptOutApps =
getGlobalSettingsString(mContentResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS);
getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS);
}
@Override
public int getAvailabilityStatus() {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
&& (Settings.Global.getInt(
mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
!= GUP_OFF)
&& (Settings.Global.getInt(mContentResolver,
Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
!= GAME_DRIVER_OFF)
? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}
@@ -146,7 +148,7 @@ public class GupPreferenceController extends BasePreferenceController
if (value.equals(mPreferenceSystem)) {
mDevOptInApps.remove(packageName);
mDevOptOutApps.add(packageName);
} else if (value.equals(mPreferenceGup)) {
} else if (value.equals(mPreferenceGameDriver)) {
mDevOptInApps.add(packageName);
mDevOptOutApps.remove(packageName);
} else {
@@ -157,10 +159,10 @@ public class GupPreferenceController extends BasePreferenceController
listPref.setSummary(value);
// Push the updated Sets for opt-in and opt-out apps to
// corresponding Settings.Global.GUP_DEV_OPT_(IN|OUT)_APPS
Settings.Global.putString(mContentResolver, Settings.Global.GUP_DEV_OPT_IN_APPS,
// corresponding Settings.Global.GAME_DRIVER_OPT_(IN|OUT)_APPS
Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS,
String.join(",", mDevOptInApps));
Settings.Global.putString(mContentResolver, Settings.Global.GUP_DEV_OPT_OUT_APPS,
Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS,
String.join(",", mDevOptOutApps));
return true;
@@ -230,13 +232,13 @@ public class GupPreferenceController extends BasePreferenceController
listPreference.setEntryValues(mEntryList);
// Initialize preference default and summary with the opt in/out choices
// from Settings.Global.GUP_DEV_OPT_(IN|OUT)_APPS
// from Settings.Global.GAME_DRIVER_OPT_(IN|OUT)_APPS
if (mDevOptOutApps.contains(packageName)) {
listPreference.setValue(mPreferenceSystem);
listPreference.setSummary(mPreferenceSystem);
} else if (mDevOptInApps.contains(packageName)) {
listPreference.setValue(mPreferenceGup);
listPreference.setSummary(mPreferenceGup);
listPreference.setValue(mPreferenceGameDriver);
listPreference.setSummary(mPreferenceGameDriver);
} else {
listPreference.setValue(mPreferenceDefault);
listPreference.setSummary(mPreferenceDefault);

5
src/com/android/settings/development/gup/GameDriverContentObserver.java → src/com/android/settings/development/gamedriver/GameDriverContentObserver.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.development.gup;
package com.android.settings.development.gamedriver;
import android.content.ContentResolver;
import android.database.ContentObserver;
@@ -27,6 +27,7 @@ import androidx.annotation.VisibleForTesting;
* Helper class to observe Game Driver settings global change.
*/
public class GameDriverContentObserver extends ContentObserver {
interface OnGameDriverContentChangedListener {
void onGameDriverContentChanged();
}
@@ -47,7 +48,7 @@ public class GameDriverContentObserver extends ContentObserver {
public void register(ContentResolver contentResolver) {
contentResolver.registerContentObserver(
Settings.Global.getUriFor(Settings.Global.GUP_DEV_ALL_APPS), false, this);
Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
}
public void unregister(ContentResolver contentResolver) {

18
src/com/android/settings/development/gup/GupDashboard.java → src/com/android/settings/development/gamedriver/GameDriverDashboard.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.development.gup;
package com.android.settings.development.gamedriver;
import android.app.settings.SettingsEnums;
import android.content.Context;
@@ -38,12 +38,13 @@ import java.util.List;
* Dashboard for Game Driver preferences.
*/
@SearchIndexable
public class GupDashboard extends DashboardFragment {
private static final String TAG = "GupDashboard";
public class GameDriverDashboard extends DashboardFragment {
private static final String TAG = "GameDriverDashboard";
@Override
public int getMetricsCategory() {
return SettingsEnums.SETTINGS_GUP_DASHBOARD;
return SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD;
}
@Override
@@ -53,7 +54,7 @@ public class GupDashboard extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return R.xml.gup_settings;
return R.xml.game_driver_settings;
}
@Override
@@ -67,8 +68,9 @@ public class GupDashboard extends DashboardFragment {
final SettingsActivity activity = (SettingsActivity) getActivity();
final SwitchBar switchBar = activity.getSwitchBar();
final GupGlobalSwitchBarController switchBarController =
new GupGlobalSwitchBarController(activity, new SwitchBarController(switchBar));
final GameDriverGlobalSwitchBarController switchBarController =
new GameDriverGlobalSwitchBarController(
activity, new SwitchBarController(switchBar));
getSettingsLifecycle().addObserver(switchBarController);
switchBar.show();
}
@@ -80,7 +82,7 @@ public class GupDashboard extends DashboardFragment {
Context context, boolean enabled) {
final List<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.gup_settings;
sir.xmlResId = R.xml.game_driver_settings;
result.add(sir);
return result;
}

30
src/com/android/settings/development/gup/GupEnableForAllAppsPreferenceController.java → src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.development.gup;
package com.android.settings.development.gamedriver;
import android.content.ContentResolver;
import android.content.Context;
@@ -36,13 +36,14 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
/**
* Controller of global switch to enable Game Driver for all Apps.
*/
public class GupEnableForAllAppsPreferenceController extends BasePreferenceController
public class GameDriverEnableForAllAppsPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
public static final int GUP_DEFAULT = 0;
public static final int GUP_ALL_APPS = 1;
public static final int GUP_OFF = 2;
public static final int GAME_DRIVER_DEFAULT = 0;
public static final int GAME_DRIVER_ALL_APPS = 1;
public static final int GAME_DRIVER_OFF = 2;
private final Context mContext;
private final ContentResolver mContentResolver;
@@ -51,7 +52,7 @@ public class GupEnableForAllAppsPreferenceController extends BasePreferenceContr
private SwitchPreference mPreference;
public GupEnableForAllAppsPreferenceController(Context context, String key) {
public GameDriverEnableForAllAppsPreferenceController(Context context, String key) {
super(context, key);
mContext = context;
mContentResolver = context.getContentResolver();
@@ -62,9 +63,9 @@ public class GupEnableForAllAppsPreferenceController extends BasePreferenceContr
@Override
public int getAvailabilityStatus() {
return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
&& (Settings.Global.getInt(
mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
!= GUP_OFF)
&& (Settings.Global.getInt(mContentResolver,
Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
!= GAME_DRIVER_OFF)
? AVAILABLE
: CONDITIONALLY_UNAVAILABLE;
}
@@ -89,15 +90,16 @@ public class GupEnableForAllAppsPreferenceController extends BasePreferenceContr
public void updateState(Preference preference) {
final SwitchPreference switchPreference = (SwitchPreference) preference;
switchPreference.setVisible(isAvailable());
switchPreference.setChecked(Settings.Global.getInt(mContentResolver,
Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
== GUP_ALL_APPS);
switchPreference.setChecked(
Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
== GAME_DRIVER_ALL_APPS);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS,
(boolean) newValue ? GUP_ALL_APPS : GUP_DEFAULT);
Settings.Global.putInt(mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS,
(boolean) newValue ? GAME_DRIVER_ALL_APPS : GAME_DRIVER_DEFAULT);
return true;
}

11
src/com/android/settings/development/gup/GameDriverFooterPreferenceController.java → src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceController.java
View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package com.android.settings.development.gup;
package com.android.settings.development.gamedriver;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import android.content.ContentResolver;
import android.content.Context;
@@ -41,6 +41,7 @@ import com.android.settingslib.widget.FooterPreference;
public class GameDriverFooterPreferenceController extends BasePreferenceController
implements GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
private final ContentResolver mContentResolver;
@VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver;
@@ -57,8 +58,8 @@ public class GameDriverFooterPreferenceController extends BasePreferenceControll
@Override
public int getAvailabilityStatus() {
return Settings.Global.getInt(
mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
== GUP_OFF
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
== GAME_DRIVER_OFF
? AVAILABLE_UNSEARCHABLE
: CONDITIONALLY_UNAVAILABLE;
}

39
src/com/android/settings/development/gup/GupGlobalSwitchBarController.java → src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarController.java
View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package com.android.settings.development.gup;
package com.android.settings.development.gamedriver;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_ALL_APPS;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_DEFAULT;
import static com.android.settings.development.gup.GupEnableForAllAppsPreferenceController.GUP_OFF;
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 android.content.ContentResolver;
import android.content.Context;
@@ -37,10 +37,11 @@ import com.android.settingslib.development.DevelopmentSettingsEnabler;
/**
* Controller of global switch bar used to fully turn off Game Driver.
*/
public class GupGlobalSwitchBarController
public class GameDriverGlobalSwitchBarController
implements SwitchWidgetController.OnSwitchChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop {
private final Context mContext;
private final ContentResolver mContentResolver;
@VisibleForTesting
@@ -48,7 +49,8 @@ public class GupGlobalSwitchBarController
@VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver;
GupGlobalSwitchBarController(Context context, SwitchWidgetController switchWidgetController) {
GameDriverGlobalSwitchBarController(
Context context, SwitchWidgetController switchWidgetController) {
mContext = context;
mContentResolver = context.getContentResolver();
mGameDriverContentObserver =
@@ -56,9 +58,10 @@ public class GupGlobalSwitchBarController
mSwitchWidgetController = switchWidgetController;
mSwitchWidgetController.setEnabled(
DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
mSwitchWidgetController.setChecked(Settings.Global.getInt(mContentResolver,
Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
!= GUP_OFF);
mSwitchWidgetController.setChecked(
Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
!= GAME_DRIVER_OFF);
mSwitchWidgetController.setListener(this);
}
@@ -77,13 +80,16 @@ public class GupGlobalSwitchBarController
@Override
public boolean onSwitchToggled(boolean isChecked) {
if (!isChecked) {
Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_OFF);
Settings.Global.putInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
return true;
}
if (Settings.Global.getInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
!= GUP_ALL_APPS) {
Settings.Global.putInt(mContentResolver, Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT);
if (Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
!= GAME_DRIVER_ALL_APPS) {
Settings.Global.putInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
}
return true;
@@ -91,8 +97,9 @@ public class GupGlobalSwitchBarController
@Override
public void onGameDriverContentChanged() {
mSwitchWidgetController.setChecked(Settings.Global.getInt(mContentResolver,
Settings.Global.GUP_DEV_ALL_APPS, GUP_DEFAULT)
!= GUP_OFF);
mSwitchWidgetController.setChecked(
Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
!= GAME_DRIVER_OFF);
}
}