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

Commit 7a923666 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Game Driver: rename GUP to Game Driver"

parents 9a87eab2 bf854fc4

res/values/strings.xml

+20 −20
Original line number Diff line number Diff line
@@ -10144,27 +10144,27 @@ 
    <!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->

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













    <!-- Title for Game Update Package dashboard where developers can configure apps to use GUP or not [CHAR LIMIT=50] -->













    <string name="gup_dashboard_title">Game Update Package Preferences</string>













    <!-- Summary for Game Update Package dashboard [CHAR LIMIT=50] -->













    <string name="gup_dashboard_summary">Modify Game Update Package settings</string>













    <!-- Footer text for Game Update Package dashboard [CHAR LIMIT=NONE] -->













    <!-- Title for Game Driver dashboard where developers can configure apps to use game driver or not [CHAR LIMIT=50] -->













    <string name="game_driver_dashboard_title">Game Driver Preferences</string>













    <!-- Summary for Game Driver dashboard [CHAR LIMIT=50] -->













    <string name="game_driver_dashboard_summary">Modify Game Driver settings</string>













    <!-- Footer text for Game Driver dashboard [CHAR LIMIT=NONE] -->















    <string name="game_driver_footer_text">When Game Driver is turned on, you can pick to use the updated graphics driver for Apps installed on the device.</string>













    <!-- Title for Game Update Package all apps preference [CHAR LIMIT=50] -->













    <string name="gup_all_apps_switch_title">Enable for all apps</string>













    <!-- Title for Game Update Package preference [CHAR LIMIT=50] -->













    <string name="gup_app_preference_title">Select Graphics Driver</string>













    <!-- The default value for Game Update Package preference [CHAR LIMIT=50] -->













    <string name="gup_app_preference_default">Default</string>













    <!-- The gup value for Game Update Package preference [CHAR LIMIT=50] -->













    <string name="gup_app_preference_gup">Game Update Package</string>













    <!-- The system value for Game Update Package preference [CHAR LIMIT=50] -->













    <string name="gup_app_preference_system">System Graphics Driver</string>













    <!-- All the values for Game Update Package preference [CHAR LIMIT=50] -->













    <string-array name="gup_app_preference_values">













        <item>@string/gup_app_preference_default</item>













        <item>@string/gup_app_preference_gup</item>













        <item>@string/gup_app_preference_system</item>













    <!-- Title for Game Driver all apps preference [CHAR LIMIT=50] -->













    <string name="game_driver_all_apps_preference_title">Enable for all apps</string>













    <!-- Title for Game Driver app preference [CHAR LIMIT=50] -->













    <string name="game_driver_app_preference_title">Select Graphics Driver</string>













    <!-- The default value for Game Driver app preference [CHAR LIMIT=50] -->













    <string name="game_driver_app_preference_default">Default</string>













    <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->













    <string name="game_driver_app_preference_game_driver">Game Driver</string>













    <!-- The system value for Game Driver app preference [CHAR LIMIT=50] -->













    <string name="game_driver_app_preference_system">System Graphics Driver</string>













    <!-- All the values for Game Driver app preference [CHAR LIMIT=50] -->













    <string-array name="game_driver_app_preference_values">













        <item>@string/game_driver_app_preference_default</item>













        <item>@string/game_driver_app_preference_game_driver</item>













        <item>@string/game_driver_app_preference_system</item>















    </string-array>





























    <!-- Slices Strings -->

























res/xml/development_settings.xml



+4
−4




























Original line number
Diff line number
Diff line








@@ -194,10 +194,10 @@













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































        <Preference













            android:key="gup_dashboard"













            android:title="@string/gup_dashboard_title"













            android:summary="@string/gup_dashboard_summary"













            android:fragment="com.android.settings.development.gup.GupDashboard"













            android:key="game_driver_dashboard"













            android:title="@string/game_driver_dashboard_title"













            android:summary="@string/game_driver_dashboard_summary"













            android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard"















            settings:searchable="false" />































    </PreferenceCategory>

































res/xml/gup_settings.xml→res/xml/game_driver_settings.xml



+9
−9




























Original line number
Diff line number
Diff line








@@ -18,26 +18,26 @@













<PreferenceScreen















    xmlns:android="http://schemas.android.com/apk/res/android"















    xmlns:settings="http://schemas.android.com/apk/res-auto"













    android:key="gup_settings"













    android:title="@string/gup_dashboard_title">













    android:key="game_driver_settings"













    android:title="@string/game_driver_dashboard_title">































    <SwitchPreference













        android:key="gup_all_apps_preference"













        android:title="@string/gup_all_apps_switch_title"













        settings:controller="com.android.settings.development.gup.GupEnableForAllAppsPreferenceController">













        android:key="game_driver_all_apps_preference"













        android:title="@string/game_driver_all_apps_preference_title"













        settings:controller="com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController">















    </SwitchPreference>































    <PreferenceCategory













        android:key="gup_category"













        android:title="@string/gup_app_preference_title"













        settings:controller="com.android.settings.development.gup.GupPreferenceController">













        android:key="game_driver_category"













        android:title="@string/game_driver_app_preference_title"













        settings:controller="com.android.settings.development.gamedriver.GameDriverAppPreferenceController">















    </PreferenceCategory>































    <com.android.settingslib.widget.FooterPreference















        android:key="footer_preference"















        android:title="@string/game_driver_footer_text"















        android:selectable="false"













        settings:controller="com.android.settings.development.gup.GameDriverFooterPreferenceController">













        settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController">















    </com.android.settingslib.widget.FooterPreference>































</PreferenceScreen>
























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



+25
−23




























Original line number
Diff line number
Diff line








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

































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



+3
−2




























Original line number
Diff line number
Diff line








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