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

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

Merge "Rename some resource values for graphics driver preferences dashboard."

parents 21bc28ca d03dd5ce

res/values/strings.xml

+26 −26
Original line number Diff line number Diff line
@@ -10811,34 +10811,34 @@ 
    <!-- 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 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 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>













    <!-- Title for graphics driver dashboard where developers can configure apps to choose graphics driver [CHAR LIMIT=50] -->













    <string name="graphics_driver_dashboard_title">Graphics Driver Preferences</string>













    <!-- Summary for graphics driver dashboard [CHAR LIMIT=50] -->













    <string name="graphics_driver_dashboard_summary">Modify graphics driver settings</string>













    <!-- Footer text for graphics driver dashboard [CHAR LIMIT=NONE] -->













    <string name="graphics_driver_footer_text">When there are multiple graphics drivers, you can pick to use the updated graphics driver for Apps installed on the device.</string>













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













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













    <!-- Title for graphics driver preference for app [CHAR LIMIT=50] -->













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













    <!-- The default value of graphics driver preference for app [CHAR LIMIT=50] -->













    <string name="graphics_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 game driver value for Prerelease Game Driver app preference [CHAR LIMIT=50] -->













    <string name="game_driver_app_preference_prerelease_driver">Prerelease 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 all apps preference [CHAR LIMIT=50] -->













    <string-array name="game_driver_all_apps_preference_values">













        <item>@string/game_driver_app_preference_default</item>













        <item>@string/game_driver_app_preference_game_driver</item>













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













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













    <string name="graphics_driver_app_preference_prerelease_driver">Prerelease Driver</string>













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













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













    <!-- All the graphics driver preference values for all apps globally [CHAR LIMIT=50] -->













    <string-array name="graphics_driver_all_apps_preference_values">













        <item>@string/graphics_driver_app_preference_default</item>













        <item>@string/graphics_driver_app_preference_game_driver</item>















    </string-array>













    <!-- 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>













    <!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->













    <string-array name="graphics_driver_app_preference_values">













        <item>@string/graphics_driver_app_preference_default</item>













        <item>@string/graphics_driver_app_preference_game_driver</item>













        <item>@string/graphics_driver_app_preference_system</item>















    </string-array>





























    <!-- Title for App Compatibility Changes dashboard where developers can configure per-app overrides for compatibility changes [CHAR LIMIT=50] -->

























res/xml/development_settings.xml



+3
−3




























Original line number
Diff line number
Diff line








@@ -217,9 +217,9 @@













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































        <Preference













            android:key="game_driver_dashboard"













            android:title="@string/game_driver_dashboard_title"













            android:summary="@string/game_driver_dashboard_summary"













            android:key="graphics_driver_dashboard"













            android:title="@string/graphics_driver_dashboard_title"













            android:summary="@string/graphics_driver_dashboard_summary"















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















            settings:searchable="false" />

















































res/xml/game_driver_settings.xml→res/xml/graphics_driver_settings.xml



+11
−11




























Original line number
Diff line number
Diff line








@@ -18,27 +18,27 @@













<PreferenceScreen















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















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













    android:key="game_driver_settings"













    android:title="@string/game_driver_dashboard_title">













    android:key="graphics_driver_settings"













    android:title="@string/graphics_driver_dashboard_title">































    <ListPreference













        android:key="game_driver_all_apps_preference"













        android:title="@string/game_driver_all_apps_preference_title"













        android:dialogTitle="@string/game_driver_all_apps_preference_title"













        android:entries="@array/game_driver_all_apps_preference_values"













        android:entryValues="@array/game_driver_all_apps_preference_values"













        android:key="graphics_driver_all_apps_preference"













        android:title="@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:entryValues="@array/graphics_driver_all_apps_preference_values"















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















    </ListPreference>































    <PreferenceCategory













        android:key="game_driver_category"













        android:title="@string/game_driver_app_preference_title"













        android:key="graphics_driver_category"













        android:title="@string/graphics_driver_app_preference_title"















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















    </PreferenceCategory>































    <com.android.settingslib.widget.FooterPreference













        android:key="game_driver_footer"













        android:title="@string/game_driver_footer_text"













        android:key="graphics_driver_footer"













        android:title="@string/graphics_driver_footer_text"















        android:selectable="false"















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















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

































src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java



+6
−6




























Original line number
Diff line number
Diff line








@@ -85,14 +85,14 @@ public class GameDriverAppPreferenceController extends BasePreferenceController













                new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);































        final Resources resources = context.getResources();













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













        mEntryList = resources.getStringArray(R.array.graphics_driver_app_preference_values);













        mPreferenceTitle = resources.getString(R.string.graphics_driver_app_preference_title);













        mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);















        mPreferenceGameDriver =













                resources.getString(R.string.game_driver_app_preference_game_driver);













                resources.getString(R.string.graphics_driver_app_preference_game_driver);















        mPreferencePrereleaseDriver =













                resources.getString(R.string.game_driver_app_preference_prerelease_driver);













        mPreferenceSystem = resources.getString(R.string.game_driver_app_preference_system);













                resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);













        mPreferenceSystem = resources.getString(R.string.graphics_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.

































src/com/android/settings/development/gamedriver/GameDriverDashboard.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -49,7 +49,7 @@ public class GameDriverDashboard extends DashboardFragment {





























    @Override















    protected int getPreferenceScreenResId() {













        return R.xml.game_driver_settings;













        return R.xml.graphics_driver_settings;















    }































    @Override









@@ -71,7 +71,7 @@ public class GameDriverDashboard extends DashboardFragment {













    }































    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =













            new BaseSearchIndexProvider(R.xml.game_driver_settings) {













            new BaseSearchIndexProvider(R.xml.graphics_driver_settings) {































                @Override















                protected boolean isPageSearchEnabled(Context context) {