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

2
res/xml/development_settings.xml
View File

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

6
res/xml/graphics_driver_settings.xml
View File

@@ -26,20 +26,20 @@
android:dialogTitle="@string/graphics_driver_all_apps_preference_title" android:dialogTitle="@string/graphics_driver_all_apps_preference_title"
android:entries="@array/graphics_driver_all_apps_preference_values" android:entries="@array/graphics_driver_all_apps_preference_values"
android:entryValues="@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> </ListPreference>
<PreferenceCategory <PreferenceCategory
android:key="graphics_driver_category" android:key="graphics_driver_category"
android:title="@string/graphics_driver_app_preference_title" 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> </PreferenceCategory>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="graphics_driver_footer" android:key="graphics_driver_footer"
android:title="@string/graphics_driver_footer_text" android:title="@string/graphics_driver_footer_text"
android:selectable="false" android:selectable="false"
settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController"> settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverFooterPreferenceController">
</com.android.settingslib.widget.FooterPreference> </com.android.settingslib.widget.FooterPreference>
</PreferenceScreen> </PreferenceScreen>

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. * 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.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -53,9 +53,9 @@ import java.util.Set;
/** /**
* Controller of all the per App based list preferences. * Controller of all the per App based list preferences.
*/ */
public class GameDriverAppPreferenceController extends BasePreferenceController public class GraphicsDriverAppPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener, implements Preference.OnPreferenceChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver, GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener, LifecycleObserver,
OnStart, OnStop { OnStart, OnStop {
private final Context mContext; private final Context mContext;
@@ -67,7 +67,7 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
private final String mPreferencePrereleaseDriver; private final String mPreferencePrereleaseDriver;
private final String mPreferenceSystem; private final String mPreferenceSystem;
@VisibleForTesting @VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver; GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private final List<AppInfo> mAppInfos; private final List<AppInfo> mAppInfos;
private final Set<String> mDevOptInApps; private final Set<String> mDevOptInApps;
@@ -76,13 +76,13 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
private PreferenceGroup mPreferenceGroup; private PreferenceGroup mPreferenceGroup;
public GameDriverAppPreferenceController(Context context, String key) { public GraphicsDriverAppPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mContext = context; mContext = context;
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mGameDriverContentObserver = mGraphicsDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this); new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
final Resources resources = context.getResources(); final Resources resources = context.getResources();
mEntryList = resources.getStringArray(R.array.graphics_driver_app_preference_values); mEntryList = resources.getStringArray(R.array.graphics_driver_app_preference_values);
@@ -130,12 +130,12 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
@Override @Override
public void onStart() { public void onStart() {
mGameDriverContentObserver.register(mContentResolver); mGraphicsDriverContentObserver.register(mContentResolver);
} }
@Override @Override
public void onStop() { public void onStop() {
mGameDriverContentObserver.unregister(mContentResolver); mGraphicsDriverContentObserver.unregister(mContentResolver);
} }
@Override @Override
@@ -185,7 +185,7 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
} }
@Override @Override
public void onGameDriverContentChanged() { public void onGraphicsDriverContentChanged() {
updateState(mPreferenceGroup); updateState(mPreferenceGroup);
} }
@@ -196,8 +196,8 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
label = packageManager.getApplicationLabel(applicationInfo).toString(); label = packageManager.getApplicationLabel(applicationInfo).toString();
} }
final ApplicationInfo info; public final ApplicationInfo info;
final String label; public final String label;
} }
// List of non-system packages that are installed for the current user. // 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; return appInfos;
} }
@@ -231,8 +231,8 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
return valueSet; return valueSet;
} }
private final Comparator<AppInfo> appInfoComparator = new Comparator<AppInfo>() { private final Comparator<AppInfo> mAppInfoComparator = new Comparator<AppInfo>() {
public final int compare(AppInfo a, AppInfo b) { public int compare(AppInfo a, AppInfo b) {
return Collator.getInstance().compare(a.label, b.label); 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. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.database.ContentObserver; import android.database.ContentObserver;
@@ -24,18 +24,19 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting; 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 { interface OnGraphicsDriverContentChangedListener {
void onGameDriverContentChanged(); void onGraphicsDriverContentChanged();
} }
@VisibleForTesting @VisibleForTesting
OnGameDriverContentChangedListener mListener; OnGraphicsDriverContentChangedListener mListener;
public GameDriverContentObserver(Handler handler, OnGameDriverContentChangedListener listener) { public GraphicsDriverContentObserver(Handler handler,
OnGraphicsDriverContentChangedListener listener) {
super(handler); super(handler);
mListener = listener; mListener = listener;
} }
@@ -43,14 +44,20 @@ public class GameDriverContentObserver extends ContentObserver {
@Override @Override
public void onChange(boolean selfChange) { public void onChange(boolean selfChange) {
super.onChange(selfChange); super.onChange(selfChange);
mListener.onGameDriverContentChanged(); mListener.onGraphicsDriverContentChanged();
} }
/**
* Register GraphicsDriverContentObserver to ContentResolver.
*/
public void register(ContentResolver contentResolver) { public void register(ContentResolver contentResolver) {
contentResolver.registerContentObserver( contentResolver.registerContentObserver(
Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this); Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
} }
/**
* Unregister GraphicsDriverContentObserver.
*/
public void unregister(ContentResolver contentResolver) { public void unregister(ContentResolver contentResolver) {
contentResolver.unregisterContentObserver(this); 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. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
@@ -33,9 +33,9 @@ import com.android.settingslib.search.SearchIndexable;
* Dashboard for Game Driver preferences. * Dashboard for Game Driver preferences.
*/ */
@SearchIndexable @SearchIndexable
public class GameDriverDashboard extends DashboardFragment { public class GraphicsDriverDashboard extends DashboardFragment {
private static final String TAG = "GameDriverDashboard"; private static final String TAG = "GraphicsDriverDashboard";
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
@@ -63,8 +63,8 @@ public class GameDriverDashboard extends DashboardFragment {
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
final SwitchBar switchBar = activity.getSwitchBar(); final SwitchBar switchBar = activity.getSwitchBar();
final GameDriverGlobalSwitchBarController switchBarController = final GraphicsDriverGlobalSwitchBarController switchBarController =
new GameDriverGlobalSwitchBarController( new GraphicsDriverGlobalSwitchBarController(
activity, new SwitchBarController(switchBar)); activity, new SwitchBarController(switchBar));
getSettingsLifecycle().addObserver(switchBarController); getSettingsLifecycle().addObserver(switchBarController);
switchBar.show(); 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. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; 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. * Controller of global switch to enable Game Driver for all Apps.
*/ */
public class GameDriverEnableForAllAppsPreferenceController extends BasePreferenceController public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener, implements Preference.OnPreferenceChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver, GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
OnStart, OnStop { LifecycleObserver, OnStart, OnStop {
public static final int GAME_DRIVER_DEFAULT = 0; public static final int GAME_DRIVER_DEFAULT = 0;
public static final int GAME_DRIVER_ALL_APPS = 1; 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 mPreferenceGameDriver;
private final String mPreferencePrereleaseDriver; private final String mPreferencePrereleaseDriver;
@VisibleForTesting @VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver; GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private ListPreference mPreference; private ListPreference mPreference;
public GameDriverEnableForAllAppsPreferenceController(Context context, String key) { public GraphicsDriverEnableForAllAppsPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mContext = context; mContext = context;
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
@@ -69,8 +69,8 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
resources.getString(R.string.graphics_driver_app_preference_game_driver); resources.getString(R.string.graphics_driver_app_preference_game_driver);
mPreferencePrereleaseDriver = mPreferencePrereleaseDriver =
resources.getString(R.string.graphics_driver_app_preference_prerelease_driver); resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
mGameDriverContentObserver = mGraphicsDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this); new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
} }
@Override @Override
@@ -92,12 +92,12 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
@Override @Override
public void onStart() { public void onStart() {
mGameDriverContentObserver.register(mContentResolver); mGraphicsDriverContentObserver.register(mContentResolver);
} }
@Override @Override
public void onStop() { public void onStop() {
mGameDriverContentObserver.unregister(mContentResolver); mGraphicsDriverContentObserver.unregister(mContentResolver);
} }
@Override @Override
@@ -144,7 +144,7 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
} }
@Override @Override
public void onGameDriverContentChanged() { public void onGraphicsDriverContentChanged() {
updateState(mPreference); 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. * 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.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -35,23 +35,23 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.FooterPreference; 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 public class GraphicsDriverFooterPreferenceController extends BasePreferenceController
implements GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver, implements GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
OnStart, OnStop { LifecycleObserver, OnStart, OnStop {
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
@VisibleForTesting @VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver; GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private FooterPreference mPreference; private FooterPreference mPreference;
public GameDriverFooterPreferenceController(Context context, String key) { public GraphicsDriverFooterPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mGameDriverContentObserver = mGraphicsDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this); new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
} }
@Override @Override
@@ -71,16 +71,16 @@ public class GameDriverFooterPreferenceController extends BasePreferenceControll
@Override @Override
public void onStart() { public void onStart() {
mGameDriverContentObserver.register(mContentResolver); mGraphicsDriverContentObserver.register(mContentResolver);
} }
@Override @Override
public void onStop() { public void onStop() {
mGameDriverContentObserver.unregister(mContentResolver); mGraphicsDriverContentObserver.unregister(mContentResolver);
} }
@Override @Override
public void onGameDriverContentChanged() { public void onGraphicsDriverContentChanged() {
updateState(mPreference); 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. * 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.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.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_PRERELEASE_ALL_APPS;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; 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. * Controller of global switch bar used to fully turn off Game Driver.
*/ */
public class GameDriverGlobalSwitchBarController public class GraphicsDriverGlobalSwitchBarController
implements SwitchWidgetController.OnSwitchChangeListener, implements SwitchWidgetController.OnSwitchChangeListener,
GameDriverContentObserver.OnGameDriverContentChangedListener, LifecycleObserver, GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
OnStart, OnStop { LifecycleObserver, OnStart, OnStop {
private final Context mContext; private final Context mContext;
private final ContentResolver mContentResolver; private final ContentResolver mContentResolver;
@VisibleForTesting @VisibleForTesting
SwitchWidgetController mSwitchWidgetController; SwitchWidgetController mSwitchWidgetController;
@VisibleForTesting @VisibleForTesting
GameDriverContentObserver mGameDriverContentObserver; GraphicsDriverContentObserver mGraphicsDriverContentObserver;
GameDriverGlobalSwitchBarController( GraphicsDriverGlobalSwitchBarController(
Context context, SwitchWidgetController switchWidgetController) { Context context, SwitchWidgetController switchWidgetController) {
mContext = context; mContext = context;
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mGameDriverContentObserver = mGraphicsDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this); new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
mSwitchWidgetController = switchWidgetController; mSwitchWidgetController = switchWidgetController;
mSwitchWidgetController.setEnabled( mSwitchWidgetController.setEnabled(
DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)); DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
@@ -69,27 +69,28 @@ public class GameDriverGlobalSwitchBarController
@Override @Override
public void onStart() { public void onStart() {
mSwitchWidgetController.startListening(); mSwitchWidgetController.startListening();
mGameDriverContentObserver.register(mContentResolver); mGraphicsDriverContentObserver.register(mContentResolver);
} }
@Override @Override
public void onStop() { public void onStop() {
mSwitchWidgetController.stopListening(); mSwitchWidgetController.stopListening();
mGameDriverContentObserver.unregister(mContentResolver); mGraphicsDriverContentObserver.unregister(mContentResolver);
} }
@Override @Override
public boolean onSwitchToggled(boolean isChecked) { 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); mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
if (isChecked if (isChecked
&& (gameDriver == GAME_DRIVER_DEFAULT || gameDriver == GAME_DRIVER_ALL_APPS && (graphicsDriverGlobalOption == GAME_DRIVER_DEFAULT
|| gameDriver == GAME_DRIVER_PRERELEASE_ALL_APPS)) { || graphicsDriverGlobalOption == GAME_DRIVER_ALL_APPS
|| graphicsDriverGlobalOption == GAME_DRIVER_PRERELEASE_ALL_APPS)) {
return true; return true;
} }
if (!isChecked && gameDriver == GAME_DRIVER_OFF) { if (!isChecked && graphicsDriverGlobalOption == GAME_DRIVER_OFF) {
return true; return true;
} }
@@ -100,7 +101,7 @@ public class GameDriverGlobalSwitchBarController
} }
@Override @Override
public void onGameDriverContentChanged() { public void onGraphicsDriverContentChanged() {
mSwitchWidgetController.setChecked( mSwitchWidgetController.setChecked(
Settings.Global.getInt( Settings.Global.getInt(
mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT) mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)

26
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java → tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
View File

@@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -53,7 +53,7 @@ import org.robolectric.RuntimeEnvironment;
import java.util.Arrays; import java.util.Arrays;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverAppPreferenceControllerTest { public class GraphicsDriverAppPreferenceControllerTest {
private static final int DEFAULT = 0; private static final int DEFAULT = 0;
private static final int GAME_DRIVER = 1; private static final int GAME_DRIVER = 1;
@@ -71,13 +71,13 @@ public class GameDriverAppPreferenceControllerTest {
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
@Mock @Mock
private GameDriverContentObserver mGameDriverContentObserver; private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private Context mContext; private Context mContext;
private PreferenceGroup mGroup; private PreferenceGroup mGroup;
private PreferenceManager mPreferenceManager; private PreferenceManager mPreferenceManager;
private ContentResolver mResolver; private ContentResolver mResolver;
private GameDriverAppPreferenceController mController; private GraphicsDriverAppPreferenceController mController;
private CharSequence[] mValueList; private CharSequence[] mValueList;
private String mDialogTitle; private String mDialogTitle;
private String mPreferencePrereleaseDriver; private String mPreferencePrereleaseDriver;
@@ -137,19 +137,19 @@ public class GameDriverAppPreferenceControllerTest {
@Test @Test
public void onStart_shouldRegister() { public void onStart_shouldRegister() {
loadDefaultConfig(); loadDefaultConfig();
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStart(); mController.onStart();
verify(mGameDriverContentObserver).register(mResolver); verify(mGraphicsDriverContentObserver).register(mResolver);
} }
@Test @Test
public void onStop_shouldUnregister() { public void onStop_shouldUnregister() {
loadDefaultConfig(); loadDefaultConfig();
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStop(); mController.onStop();
verify(mGameDriverContentObserver).unregister(mResolver); verify(mGraphicsDriverContentObserver).unregister(mResolver);
} }
@Test @Test
@@ -295,7 +295,9 @@ public class GameDriverAppPreferenceControllerTest {
when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mContext.getPackageManager()).thenReturn(mPackageManager);
} }
private void loadDefaultConfig() { loadConfig("", "", ""); } private void loadDefaultConfig() {
loadConfig("", "", "");
}
private void loadConfig(String optIn, String prereleaseOptIn, String optOut) { 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.GAME_DRIVER_OPT_IN_APPS, optIn);
@@ -303,7 +305,7 @@ public class GameDriverAppPreferenceControllerTest {
mResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, prereleaseOptIn); mResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, prereleaseOptIn);
Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut); Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut);
mController = new GameDriverAppPreferenceController(mContext, "testKey"); mController = new GraphicsDriverAppPreferenceController(mContext, "testKey");
mGroup = spy(new PreferenceCategory(mContext)); mGroup = spy(new PreferenceCategory(mContext));
final PreferenceManager preferenceManager = new PreferenceManager(mContext); final PreferenceManager preferenceManager = new PreferenceManager(mContext);
when(mGroup.getContext()).thenReturn(mContext); when(mGroup.getContext()).thenReturn(mContext);

25
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverContentObserverTest.java → tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -28,45 +28,44 @@ import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverContentObserverTest { public class GraphicsDriverContentObserverTest {
@Mock @Mock
private ContentResolver mResolver; private ContentResolver mResolver;
@Mock @Mock
private GameDriverContentObserver.OnGameDriverContentChangedListener mListener; private GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener mListener;
private GameDriverContentObserver mGameDriverContentObserver; private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mGameDriverContentObserver = spy(new GameDriverContentObserver(null, null)); mGraphicsDriverContentObserver = spy(new GraphicsDriverContentObserver(null, null));
} }
@Test @Test
public void onChange_shouldCallListener() { public void onChange_shouldCallListener() {
mGameDriverContentObserver.mListener = mListener; mGraphicsDriverContentObserver.mListener = mListener;
mGameDriverContentObserver.onChange(true); mGraphicsDriverContentObserver.onChange(true);
verify(mListener).onGameDriverContentChanged(); verify(mListener).onGraphicsDriverContentChanged();
} }
@Test @Test
public void register_shouldRegisterContentObserver() { public void register_shouldRegisterContentObserver() {
mGameDriverContentObserver.register(mResolver); mGraphicsDriverContentObserver.register(mResolver);
verify(mResolver).registerContentObserver( verify(mResolver).registerContentObserver(
Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false,
mGameDriverContentObserver); mGraphicsDriverContentObserver);
} }
@Test @Test
public void unregister_shouldUnregisterContentObserver() { public void unregister_shouldUnregisterContentObserver() {
mGameDriverContentObserver.unregister(mResolver); mGraphicsDriverContentObserver.unregister(mResolver);
verify(mResolver).unregisterContentObserver(mGameDriverContentObserver); verify(mResolver).unregisterContentObserver(mGraphicsDriverContentObserver);
} }
} }

12
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverDashboardTest.java → tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -28,13 +28,13 @@ import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverDashboardTest { public class GraphicsDriverDashboardTest {
private GameDriverDashboard mDashboard; private GraphicsDriverDashboard mDashboard;
@Before @Before
public void setUp() { public void setUp() {
mDashboard = new GameDriverDashboard(); mDashboard = new GraphicsDriverDashboard();
} }
@Test @Test
@@ -43,13 +43,13 @@ public class GameDriverDashboardTest {
} }
@Test @Test
public void getMetricesCategory_shouldReturnGameDriverDashboard() { public void getMetricesCategory_shouldReturnGraphicsDriverDashboard() {
assertThat(mDashboard.getMetricsCategory()) assertThat(mDashboard.getMetricsCategory())
.isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD); .isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD);
} }
@Test @Test
public void getPreferenceScreen_shouldReturnGameDriverSettings() { public void getPreferenceScreen_shouldReturnGraphicsDriverSettings() {
assertThat(mDashboard.getPreferenceScreenResId()).isEqualTo(R.xml.graphics_driver_settings); assertThat(mDashboard.getPreferenceScreenResId()).isEqualTo(R.xml.graphics_driver_settings);
} }
} }

26
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceControllerTest.java → tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
View File

@@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.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_PRERELEASE_ALL_APPS;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -48,18 +48,18 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverEnableForAllAppsPreferenceControllerTest { public class GraphicsDriverEnableForAllAppsPreferenceControllerTest {
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
@Mock @Mock
private ListPreference mPreference; private ListPreference mPreference;
@Mock @Mock
private GameDriverContentObserver mGameDriverContentObserver; private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private Context mContext; private Context mContext;
private ContentResolver mResolver; private ContentResolver mResolver;
private GameDriverEnableForAllAppsPreferenceController mController; private GraphicsDriverEnableForAllAppsPreferenceController mController;
private String mPreferenceDefault; private String mPreferenceDefault;
private String mPreferenceGameDriver; private String mPreferenceGameDriver;
private String mPreferencePrereleaseDriver; private String mPreferencePrereleaseDriver;
@@ -81,7 +81,7 @@ public class GameDriverEnableForAllAppsPreferenceControllerTest {
Settings.Global.putInt( Settings.Global.putInt(
mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
mController = new GameDriverEnableForAllAppsPreferenceController(mContext, "testKey"); mController = new GraphicsDriverEnableForAllAppsPreferenceController(mContext, "testKey");
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
} }
@@ -120,18 +120,18 @@ public class GameDriverEnableForAllAppsPreferenceControllerTest {
@Test @Test
public void onStart_shouldRegister() { public void onStart_shouldRegister() {
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStart(); mController.onStart();
verify(mGameDriverContentObserver).register(mResolver); verify(mGraphicsDriverContentObserver).register(mResolver);
} }
@Test @Test
public void onStop_shouldUnregister() { public void onStop_shouldUnregister() {
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStop(); mController.onStop();
verify(mGameDriverContentObserver).unregister(mResolver); verify(mGraphicsDriverContentObserver).unregister(mResolver);
} }
@Test @Test

24
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverFooterPreferenceControllerTest.java → tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
View File

@@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; package com.android.settings.development.graphicsdriver;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
@@ -45,25 +45,25 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverFooterPreferenceControllerTest { public class GraphicsDriverFooterPreferenceControllerTest {
@Mock @Mock
private PreferenceScreen mScreen; private PreferenceScreen mScreen;
@Mock @Mock
private FooterPreference mPreference; private FooterPreference mPreference;
@Mock @Mock
private GameDriverContentObserver mGameDriverContentObserver; private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private Context mContext; private Context mContext;
private ContentResolver mResolver; private ContentResolver mResolver;
private GameDriverFooterPreferenceController mController; private GraphicsDriverFooterPreferenceController mController;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mResolver = mContext.getContentResolver(); mResolver = mContext.getContentResolver();
mController = spy(new GameDriverFooterPreferenceController(mContext, "key")); mController = spy(new GraphicsDriverFooterPreferenceController(mContext, "key"));
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
} }
@@ -92,17 +92,17 @@ public class GameDriverFooterPreferenceControllerTest {
@Test @Test
public void onStart_shouldRegister() { public void onStart_shouldRegister() {
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStart(); mController.onStart();
verify(mGameDriverContentObserver).register(mResolver); verify(mGraphicsDriverContentObserver).register(mResolver);
} }
@Test @Test
public void onStop_shouldUnregister() { public void onStop_shouldUnregister() {
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStop(); mController.onStop();
verify(mGameDriverContentObserver).unregister(mResolver); verify(mGraphicsDriverContentObserver).unregister(mResolver);
} }
} }

37
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverGlobalSwitchBarControllerTest.java → tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
View File

@@ -14,10 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.settings.development.gamedriver; 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.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -39,18 +40,18 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverGlobalSwitchBarControllerTest { public class GraphicsDriverGlobalSwitchBarControllerTest {
@Mock @Mock
private SwitchBar mSwitchBar; private SwitchBar mSwitchBar;
@Mock @Mock
private SwitchWidgetController mSwitchWidgetController; private SwitchWidgetController mSwitchWidgetController;
@Mock @Mock
private GameDriverContentObserver mGameDriverContentObserver; private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
private Context mContext; private Context mContext;
private ContentResolver mResolver; private ContentResolver mResolver;
private GameDriverGlobalSwitchBarController mController; private GraphicsDriverGlobalSwitchBarController mController;
@Before @Before
public void setUp() { public void setUp() {
@@ -63,7 +64,7 @@ public class GameDriverGlobalSwitchBarControllerTest {
public void constructor_gameDriverOn_shouldCheckSwitchBar() { public void constructor_gameDriverOn_shouldCheckSwitchBar() {
Settings.Global.putInt( Settings.Global.putInt(
mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
verify(mSwitchBar).setChecked(true); verify(mSwitchBar).setChecked(true);
@@ -72,7 +73,7 @@ public class GameDriverGlobalSwitchBarControllerTest {
@Test @Test
public void constructor_gameDriverOff_shouldUncheckSwitchBar() { public void constructor_gameDriverOff_shouldUncheckSwitchBar() {
Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
verify(mSwitchBar).setChecked(false); verify(mSwitchBar).setChecked(false);
@@ -81,7 +82,7 @@ public class GameDriverGlobalSwitchBarControllerTest {
@Test @Test
public void constructor_developmentSettingsEnabled_shouldEnableSwitchBar() { public void constructor_developmentSettingsEnabled_shouldEnableSwitchBar() {
Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
verify(mSwitchBar).setEnabled(true); verify(mSwitchBar).setEnabled(true);
@@ -90,7 +91,7 @@ public class GameDriverGlobalSwitchBarControllerTest {
@Test @Test
public void constructor_developmentSettingsDisabled_shouldDisableSwitchBar() { public void constructor_developmentSettingsDisabled_shouldDisableSwitchBar() {
Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0); Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
verify(mSwitchBar).setEnabled(false); verify(mSwitchBar).setEnabled(false);
@@ -98,32 +99,32 @@ public class GameDriverGlobalSwitchBarControllerTest {
@Test @Test
public void onStart_shouldStartListeningAndRegister() { public void onStart_shouldStartListeningAndRegister() {
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
mController.mSwitchWidgetController = mSwitchWidgetController; mController.mSwitchWidgetController = mSwitchWidgetController;
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStart(); mController.onStart();
verify(mSwitchWidgetController).startListening(); verify(mSwitchWidgetController).startListening();
verify(mGameDriverContentObserver).register(mResolver); verify(mGraphicsDriverContentObserver).register(mResolver);
} }
@Test @Test
public void onStop_shouldStopListeningAndUnregister() { public void onStop_shouldStopListeningAndUnregister() {
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
mController.mSwitchWidgetController = mSwitchWidgetController; mController.mSwitchWidgetController = mSwitchWidgetController;
mController.mGameDriverContentObserver = mGameDriverContentObserver; mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
mController.onStop(); mController.onStop();
verify(mSwitchWidgetController).stopListening(); verify(mSwitchWidgetController).stopListening();
verify(mGameDriverContentObserver).unregister(mResolver); verify(mGraphicsDriverContentObserver).unregister(mResolver);
} }
@Test @Test
public void onSwitchToggled_checked_shouldTurnOnGameDriver() { public void onSwitchToggled_checked_shouldTurnOnGameDriver() {
Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF); Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
mController.onSwitchToggled(true); mController.onSwitchToggled(true);
@@ -136,7 +137,7 @@ public class GameDriverGlobalSwitchBarControllerTest {
public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() { public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() {
Settings.Global.putInt( Settings.Global.putInt(
mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT); mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
mController = new GameDriverGlobalSwitchBarController( mController = new GraphicsDriverGlobalSwitchBarController(
mContext, new SwitchBarController(mSwitchBar)); mContext, new SwitchBarController(mSwitchBar));
mController.onSwitchToggled(false); mController.onSwitchToggled(false);