Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c528032c authored by Peiyong Lin's avatar Peiyong Lin Committed by Yiwei Zhang
Browse files

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
Merged-In: Ibc0814b6cd1e9bee991624c925456bc330fd93c6
parent 5a92a74f

res/values/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -9982,12 +9982,12 @@ 
         show both names, with the directory name wrapped in parenthesis -->

    <string name="directory_on_volume"><xliff:g id="volume" example="SD Card">%1$s</xliff:g> (<xliff:g id="directory" example="Movies">%2$s</xliff:g>)</string>













    <!-- UI debug setting: select an app to use updated graphics driver [CHAR LIMIT=100] -->













    <string name="updated_gfx_driver_dev_opt_in_app">Select app to use updated graphics driver</string>













    <!-- UI debug setting: no app selected to use updated GPU driver [CHAR LIMIT=100] -->













    <string name="updated_gfx_driver_dev_opt_in_app_not_set">No selected app to use updated graphics driver</string>













    <!-- UI debug setting: app selected to use updated graphics driver [CHAR LIMIT=NONE] -->













    <string name="updated_gfx_driver_dev_opt_in_app_set">Opt in application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>













    <!-- UI debug setting: select an app to use Game Update Package [CHAR LIMIT=100] -->













    <string name="gup_dev_opt_in_app">Use Game Update Package</string>













    <!-- UI debug setting: no app selected to use Game Update Package [CHAR LIMIT=100] -->













    <string name="gup_dev_opt_in_app_not_set">No selected app</string>













    <!-- UI debug setting: app selected to use Game Update Package [CHAR LIMIT=NONE] -->













    <string name="gup_dev_opt_in_app_set"><xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>





























    <!-- Slices Strings -->







































res/xml/development_settings.xml



+4
−3




























Original line number
Diff line number
Diff line








@@ -425,9 +425,10 @@













            android:summary="%s"















            android:title="@string/simulate_color_space" />





























        <Preference android:key="updated_gfx_driver_dev_opt_in_app"













            android:summary="@string/updated_gfx_driver_dev_opt_in_app_summary"













            android:title="@string/updated_gfx_driver_dev_opt_in_app" />













        <Preference













            android:title="@string/gup_dev_opt_in_app"













            android:key="gup_dev_opt_in_app"













            android:summary="@string/gup_dev_opt_in_app_summary" />































    </PreferenceCategory>

















































src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -26,5 +26,5 @@ public interface DevelopmentOptionsActivityRequestCodes {





























    int REQUEST_MOCK_LOCATION_APP = 2;





























    int REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = 4;













    int REQUEST_CODE_GUP_DEV_OPT_IN_APPS = 6;















}
























src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -400,7 +400,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));

































src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceController.java→src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java



+15
−18




























Original line number
Diff line number
Diff line








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















        }















    }