diff options
author | Peiyong Lin <lpy@google.com> | 2018-12-26 13:21:40 -0800 |
---|---|---|
committer | Peiyong Lin <lpy@google.com> | 2019-01-03 11:19:01 -0800 |
commit | e70d1032660b110684d4e518002555d7eee5bb9e (patch) | |
tree | ab4ef95a3c08e6f23f9a11673f5e761ef6267ec1 /src | |
parent | 221b7e0b7713aef671829da933b1469788c12ac9 (diff) | |
download | packages_apps_Settings-e70d1032660b110684d4e518002555d7eee5bb9e.tar.gz packages_apps_Settings-e70d1032660b110684d4e518002555d7eee5bb9e.tar.bz2 packages_apps_Settings-e70d1032660b110684d4e518002555d7eee5bb9e.zip |
Rename updatable graphics driver to Game Update Package.
We have rebranded this project to Game Update Package, and GUP for short.
BUG: 119221883
Test: Build, flash and boot. Verify by going to developer options.
Change-Id: Ibc0814b6cd1e9bee991624c925456bc330fd93c6
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java | 2 | ||||
-rw-r--r-- | src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java | 2 | ||||
-rw-r--r-- | src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java (renamed from src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceController.java) | 33 |
3 files changed, 17 insertions, 20 deletions
diff --git a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java index e65d2ad69c..a67aac4d3a 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 aa9918ce43..5990320321 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 index ad2131efaa..2d295055ea 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)); } } |