diff --git a/res/values/strings.xml b/res/values/strings.xml index a1d67d5b221..089ade9a82c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10042,12 +10042,12 @@ ANGLE enabled application: %1$s - - Select app to use updated graphics driver - - No selected app to use updated graphics driver - - Opt in application: %1$s + + Use Game Update Package + + No selected app + + %1$s diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index be45cd09f51..214c00c5bbf 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -424,9 +424,10 @@ android:summary="%s" android:title="@string/simulate_color_space" /> - + diff --git a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java index e65d2ad69cf..a67aac4d3a5 100644 --- a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java +++ b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java @@ -32,5 +32,5 @@ public interface DevelopmentOptionsActivityRequestCodes { int REQUEST_CODE_ANGLE_DRIVER_VALUES = 5; - int REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = 6; + int REQUEST_CODE_GUP_DEV_OPT_IN_APPS = 6; } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index aa9918ce436..5990320321c 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -423,7 +423,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new SelectDebugAppPreferenceController(context, fragment)); controllers.add(new WaitForDebuggerPreferenceController(context)); controllers.add(new EnableGpuDebugLayersPreferenceController(context)); - controllers.add(new UpdatedGfxDriverDevOptInPreferenceController(context, fragment)); + controllers.add(new GameUpdatePackageDevOptInPreferenceController(context, fragment)); controllers.add(new VerifyAppsOverUsbPreferenceController(context)); controllers.add(new LogdSizePreferenceController(context)); controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle)); diff --git a/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceController.java b/src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java similarity index 74% rename from src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceController.java rename to src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java index ad2131efaac..2d295055ea0 100644 --- a/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceController.java +++ b/src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java @@ -17,7 +17,7 @@ package com.android.settings.development; import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes - .REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP; + .REQUEST_CODE_GUP_DEV_OPT_IN_APPS; import android.app.Activity; import android.content.Context; @@ -33,17 +33,16 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; // TODO(b/119221883): Need to override isAvailable() to return false when updatable graphics driver is not supported. -public class UpdatedGfxDriverDevOptInPreferenceController +public class GameUpdatePackageDevOptInPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin, OnActivityResultListener { - private static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY = - "updated_gfx_driver_dev_opt_in_app"; + private static final String GUP_DEV_OPT_IN_APP_KEY = "gup_dev_opt_in_app"; private final DevelopmentSettingsDashboardFragment mFragment; private final PackageManager mPackageManager; - public UpdatedGfxDriverDevOptInPreferenceController(Context context, + public GameUpdatePackageDevOptInPreferenceController(Context context, DevelopmentSettingsDashboardFragment fragment) { super(context); mFragment = fragment; @@ -52,16 +51,15 @@ public class UpdatedGfxDriverDevOptInPreferenceController @Override public String getPreferenceKey() { - return UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY; + return GUP_DEV_OPT_IN_APP_KEY; } @Override public boolean handlePreferenceTreeClick(Preference preference) { - if (UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY.equals(preference.getKey())) { + if (GUP_DEV_OPT_IN_APP_KEY.equals(preference.getKey())) { // pass it on to settings final Intent intent = getActivityStartIntent(); - mFragment.startActivityForResult(intent, - REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); + mFragment.startActivityForResult(intent, REQUEST_CODE_GUP_DEV_OPT_IN_APPS); return true; } return false; @@ -74,12 +72,12 @@ public class UpdatedGfxDriverDevOptInPreferenceController @Override public boolean onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode != REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP + if (requestCode != REQUEST_CODE_GUP_DEV_OPT_IN_APPS || resultCode != Activity.RESULT_OK) { return false; } Settings.Global.putString(mContext.getContentResolver(), - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, data.getAction()); + Settings.Global.GUP_DEV_OPT_IN_APPS, data.getAction()); updatePreferenceSummary(); return true; } @@ -88,7 +86,7 @@ public class UpdatedGfxDriverDevOptInPreferenceController protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); mPreference.setSummary(mContext.getResources().getString( - R.string.updated_gfx_driver_dev_opt_in_app_not_set)); + R.string.gup_dev_opt_in_app_not_set)); } @VisibleForTesting @@ -99,15 +97,14 @@ public class UpdatedGfxDriverDevOptInPreferenceController } private void updatePreferenceSummary() { - final String updatedGfxDriverDevOptInApp = Settings.Global.getString( - mContext.getContentResolver(), Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); - if (updatedGfxDriverDevOptInApp != null && !updatedGfxDriverDevOptInApp.isEmpty()) { + final String optInApp = Settings.Global.getString( + mContext.getContentResolver(), Settings.Global.GUP_DEV_OPT_IN_APPS); + if (optInApp != null && !optInApp.isEmpty()) { mPreference.setSummary(mContext.getResources().getString( - R.string.updated_gfx_driver_dev_opt_in_app_set, - getAppLabel(updatedGfxDriverDevOptInApp))); + R.string.gup_dev_opt_in_app_set, getAppLabel(optInApp))); } else { mPreference.setSummary(mContext.getResources().getString( - R.string.updated_gfx_driver_dev_opt_in_app_not_set)); + R.string.gup_dev_opt_in_app_not_set)); } } diff --git a/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceControllerTest.java similarity index 76% rename from tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java rename to tests/robotests/src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceControllerTest.java index e92f1a56be9..199cad6e191 100644 --- a/tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceControllerTest.java @@ -16,7 +16,7 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_GUP_DEV_OPT_IN_APPS; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -44,7 +44,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) -public class UpdatedGfxDriverDevOptInPreferenceControllerTest { +public class GameUpdatePackageDevOptInPreferenceControllerTest { @Mock private PreferenceScreen mPreferenceScreen; @@ -53,13 +53,13 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest { private Context mContext; private Preference mPreference; - private UpdatedGfxDriverDevOptInPreferenceController mController; + private GameUpdatePackageDevOptInPreferenceController mController; @Before public void setup() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = spy(new UpdatedGfxDriverDevOptInPreferenceController(mContext, mFragment)); + mController = spy(new GameUpdatePackageDevOptInPreferenceController(mContext, mFragment)); mPreference = new Preference(mContext); mPreference.setKey(mController.getPreferenceKey()); @@ -75,18 +75,19 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest { mController.handlePreferenceTreeClick(mPreference); verify(mFragment).startActivityForResult(activityStartIntent, - REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); + REQUEST_CODE_GUP_DEV_OPT_IN_APPS); } @Test - public void updateState_foobarAppSelected_shouldUpdateSummaryWithUpdatedDriverDevOptInAppLabel() { + public void updateState_foobarAppSelected_shouldUpdateSummaryWithGUPDevOptInAppLabel() { final String selectedApp = "foobar"; final ContentResolver contentResolver = mContext.getContentResolver(); Settings.Global.putString(contentResolver, - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, selectedApp); + Settings.Global.GUP_DEV_OPT_IN_APPS, selectedApp); mController.updateState(mPreference); - assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_set, selectedApp)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(R.string.gup_dev_opt_in_app_set, selectedApp)); } @Test @@ -94,23 +95,25 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest { final String selectedApp = null; final ContentResolver contentResolver = mContext.getContentResolver(); Settings.Global.putString(contentResolver, - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, selectedApp); + Settings.Global.GUP_DEV_OPT_IN_APPS, selectedApp); mController.updateState(mPreference); - assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_not_set)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(R.string.gup_dev_opt_in_app_not_set)); } @Test - public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithUpdatedDriverDevOptInLabel() { + public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithGUPDevOptInLabel() { Intent activityResultIntent = new Intent(mContext, AppPicker.class); final String appLabel = "foobar"; activityResultIntent.setAction(appLabel); final boolean result = mController - .onActivityResult(REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, Activity.RESULT_OK, + .onActivityResult(REQUEST_CODE_GUP_DEV_OPT_IN_APPS, Activity.RESULT_OK, activityResultIntent); assertThat(result).isTrue(); - assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_set, appLabel)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(R.string.gup_dev_opt_in_app_set, appLabel)); } @Test @@ -124,6 +127,7 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest { mController.onDeveloperOptionsSwitchDisabled(); assertThat(mPreference.isEnabled()).isFalse(); - assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_not_set)); + assertThat(mPreference.getSummary()).isEqualTo( + mContext.getString(R.string.gup_dev_opt_in_app_not_set)); } }