PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some resource values for graphics driver preferences dashboard.

Browse Source 
Bug: b/148626177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=GameDriver
Change-Id: I1f63bd40d5de0cd762bf34a75c7eebd9865a13dd
This commit is contained in:
Peiyong Lin
2020-02-05 17:37:08 -08:00
parent 8b2b5ea302
commit d03dd5ce2a
10 changed files with 67 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
res/values/strings.xml
View File

@@ -10793,34 +10793,34 @@
<!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] --> <!-- 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> <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] --> <!-- Title for graphics driver dashboard where developers can configure apps to choose graphics driver [CHAR LIMIT=50] -->
<string name="game_driver_dashboard_title">Game Driver Preferences</string> <string name="graphics_driver_dashboard_title">Graphics Driver Preferences</string>
<!-- Summary for Game Driver dashboard [CHAR LIMIT=50] --> <!-- Summary for graphics driver dashboard [CHAR LIMIT=50] -->
<string name="game_driver_dashboard_summary">Modify Game Driver settings</string> <string name="graphics_driver_dashboard_summary">Modify graphics driver settings</string>
<!-- Footer text for Game Driver dashboard [CHAR LIMIT=NONE] --> <!-- Footer text for graphics 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> <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 Game Driver all apps preference [CHAR LIMIT=50] --> <!-- Title for graphics Driver all apps preference [CHAR LIMIT=50] -->
<string name="game_driver_all_apps_preference_title">Enable for all apps</string> <string name="graphics_driver_all_apps_preference_title">Enable for all apps</string>
<!-- Title for Game Driver app preference [CHAR LIMIT=50] --> <!-- Title for graphics driver preference for app [CHAR LIMIT=50] -->
<string name="game_driver_app_preference_title">Select Graphics Driver</string> <string name="graphics_driver_app_preference_title">Select Graphics Driver</string>
<!-- The default value for Game Driver app preference [CHAR LIMIT=50] --> <!-- The default value of graphics driver preference for app [CHAR LIMIT=50] -->
<string name="game_driver_app_preference_default">Default</string> <string name="graphics_driver_app_preference_default">Default</string>
<!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] --> <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->
<string name="game_driver_app_preference_game_driver">Game Driver</string> <string name="graphics_driver_app_preference_game_driver">Game Driver</string>
<!-- The game driver value for Prerelease Game Driver app preference [CHAR LIMIT=50] --> <!-- The prerelase driver value for Prerelease Driver app preference [CHAR LIMIT=50] -->
<string name="game_driver_app_preference_prerelease_driver">Prerelease Driver</string> <string name="graphics_driver_app_preference_prerelease_driver">Prerelease Driver</string>
<!-- The system value for Game Driver app preference [CHAR LIMIT=50] --> <!-- The system driver value for system graphics driver app preference [CHAR LIMIT=50] -->
<string name="game_driver_app_preference_system">System Graphics Driver</string> <string name="graphics_driver_app_preference_system">System Graphics Driver</string>
<!-- All the values for Game Driver all apps preference [CHAR LIMIT=50] --> <!-- All the graphics driver preference values for all apps globally [CHAR LIMIT=50] -->
<string-array name="game_driver_all_apps_preference_values"> <string-array name="graphics_driver_all_apps_preference_values">
<item>@string/game_driver_app_preference_default</item> <item>@string/graphics_driver_app_preference_default</item>
<item>@string/game_driver_app_preference_game_driver</item> <item>@string/graphics_driver_app_preference_game_driver</item>
</string-array> </string-array>
<!-- All the values for Game Driver app preference [CHAR LIMIT=50] --> <!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->
<string-array name="game_driver_app_preference_values"> <string-array name="graphics_driver_app_preference_values">
<item>@string/game_driver_app_preference_default</item> <item>@string/graphics_driver_app_preference_default</item>
<item>@string/game_driver_app_preference_game_driver</item> <item>@string/graphics_driver_app_preference_game_driver</item>
<item>@string/game_driver_app_preference_system</item> <item>@string/graphics_driver_app_preference_system</item>
</string-array> </string-array>
<!-- Title for App Compatibility Changes dashboard where developers can configure per-app overrides for compatibility changes [CHAR LIMIT=50] --> <!-- Title for App Compatibility Changes dashboard where developers can configure per-app overrides for compatibility changes [CHAR LIMIT=50] -->

6
res/xml/development_settings.xml
View File

@@ -217,9 +217,9 @@
android:summary="@string/enable_gpu_debug_layers_summary" /> android:summary="@string/enable_gpu_debug_layers_summary" />
<Preference <Preference
android:key="game_driver_dashboard" android:key="graphics_driver_dashboard"
android:title="@string/game_driver_dashboard_title" android:title="@string/graphics_driver_dashboard_title"
android:summary="@string/game_driver_dashboard_summary" android:summary="@string/graphics_driver_dashboard_summary"
android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard" android:fragment="com.android.settings.development.gamedriver.GameDriverDashboard"
settings:searchable="false" /> settings:searchable="false" />

22
res/xml/game_driver_settings.xml → res/xml/graphics_driver_settings.xml
View File

@@ -18,27 +18,27 @@
<PreferenceScreen <PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="game_driver_settings" android:key="graphics_driver_settings"
android:title="@string/game_driver_dashboard_title"> android:title="@string/graphics_driver_dashboard_title">
<ListPreference <ListPreference
android:key="game_driver_all_apps_preference" android:key="graphics_driver_all_apps_preference"
android:title="@string/game_driver_all_apps_preference_title" android:title="@string/graphics_driver_all_apps_preference_title"
android:dialogTitle="@string/game_driver_all_apps_preference_title" android:dialogTitle="@string/graphics_driver_all_apps_preference_title"
android:entries="@array/game_driver_all_apps_preference_values" android:entries="@array/graphics_driver_all_apps_preference_values"
android:entryValues="@array/game_driver_all_apps_preference_values" android:entryValues="@array/graphics_driver_all_apps_preference_values"
settings:controller="com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController"> settings:controller="com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController">
</ListPreference> </ListPreference>
<PreferenceCategory <PreferenceCategory
android:key="game_driver_category" android:key="graphics_driver_category"
android:title="@string/game_driver_app_preference_title" android:title="@string/graphics_driver_app_preference_title"
settings:controller="com.android.settings.development.gamedriver.GameDriverAppPreferenceController"> settings:controller="com.android.settings.development.gamedriver.GameDriverAppPreferenceController">
</PreferenceCategory> </PreferenceCategory>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="game_driver_footer" android:key="graphics_driver_footer"
android:title="@string/game_driver_footer_text" android:title="@string/graphics_driver_footer_text"
android:selectable="false" android:selectable="false"
settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController"> settings:controller="com.android.settings.development.gamedriver.GameDriverFooterPreferenceController">
</com.android.settingslib.widget.FooterPreference> </com.android.settingslib.widget.FooterPreference>

12
src/com/android/settings/development/gamedriver/GameDriverAppPreferenceController.java
View File

@@ -85,14 +85,14 @@ public class GameDriverAppPreferenceController extends BasePreferenceController
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this); new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
final Resources resources = context.getResources(); final Resources resources = context.getResources();
mEntryList = resources.getStringArray(R.array.game_driver_app_preference_values); mEntryList = resources.getStringArray(R.array.graphics_driver_app_preference_values);
mPreferenceTitle = resources.getString(R.string.game_driver_app_preference_title); mPreferenceTitle = resources.getString(R.string.graphics_driver_app_preference_title);
mPreferenceDefault = resources.getString(R.string.game_driver_app_preference_default); mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
mPreferenceGameDriver = mPreferenceGameDriver =
resources.getString(R.string.game_driver_app_preference_game_driver); resources.getString(R.string.graphics_driver_app_preference_game_driver);
mPreferencePrereleaseDriver = mPreferencePrereleaseDriver =
resources.getString(R.string.game_driver_app_preference_prerelease_driver); resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
mPreferenceSystem = resources.getString(R.string.game_driver_app_preference_system); mPreferenceSystem = resources.getString(R.string.graphics_driver_app_preference_system);
// TODO: Move this task to background if there's potential ANR/Jank. // TODO: Move this task to background if there's potential ANR/Jank.
// Update the UI when all the app infos are ready. // Update the UI when all the app infos are ready.

4
src/com/android/settings/development/gamedriver/GameDriverDashboard.java
View File

@@ -49,7 +49,7 @@ public class GameDriverDashboard extends DashboardFragment {
@Override @Override
protected int getPreferenceScreenResId() { protected int getPreferenceScreenResId() {
return R.xml.game_driver_settings; return R.xml.graphics_driver_settings;
} }
@Override @Override
@@ -71,7 +71,7 @@ public class GameDriverDashboard extends DashboardFragment {
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.game_driver_settings) { new BaseSearchIndexProvider(R.xml.graphics_driver_settings) {
@Override @Override
protected boolean isPageSearchEnabled(Context context) { protected boolean isPageSearchEnabled(Context context) {

6
src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceController.java
View File

@@ -64,11 +64,11 @@ public class GameDriverEnableForAllAppsPreferenceController extends BasePreferen
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
final Resources resources = context.getResources(); final Resources resources = context.getResources();
mPreferenceDefault = resources.getString(R.string.game_driver_app_preference_default); mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
mPreferenceGameDriver = mPreferenceGameDriver =
resources.getString(R.string.game_driver_app_preference_game_driver); resources.getString(R.string.graphics_driver_app_preference_game_driver);
mPreferencePrereleaseDriver = mPreferencePrereleaseDriver =
resources.getString(R.string.game_driver_app_preference_prerelease_driver); resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
mGameDriverContentObserver = mGameDriverContentObserver =
new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this); new GameDriverContentObserver(new Handler(Looper.getMainLooper()), this);
} }

14
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
View File

@@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT; import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF; import static com.android.settings.development.gamedriver.GameDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -41,8 +42,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import java.util.Arrays;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -51,6 +50,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import java.util.Arrays;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class GameDriverAppPreferenceControllerTest { public class GameDriverAppPreferenceControllerTest {
@@ -87,10 +88,13 @@ public class GameDriverAppPreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application); mContext = spy(RuntimeEnvironment.application);
mResolver = mContext.getContentResolver(); mResolver = mContext.getContentResolver();
mValueList = mValueList =
mContext.getResources().getStringArray(R.array.game_driver_app_preference_values); mContext.getResources().getStringArray(
mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title); R.array.graphics_driver_app_preference_values);
mDialogTitle = mContext.getResources().getString(
R.string.graphics_driver_app_preference_title);
mPreferencePrereleaseDriver = mPreferencePrereleaseDriver =
mContext.getResources().getString(R.string.game_driver_app_preference_prerelease_driver); mContext.getResources().getString(
R.string.graphics_driver_app_preference_prerelease_driver);
} }
@Test @Test

2
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverDashboardTest.java
View File

@@ -50,6 +50,6 @@ public class GameDriverDashboardTest {
@Test @Test
public void getPreferenceScreen_shouldReturnGameDriverSettings() { public void getPreferenceScreen_shouldReturnGameDriverSettings() {
assertThat(mDashboard.getPreferenceScreenResId()).isEqualTo(R.xml.game_driver_settings); assertThat(mDashboard.getPreferenceScreenResId()).isEqualTo(R.xml.graphics_driver_settings);
} }
} }

6
tests/robotests/src/com/android/settings/development/gamedriver/GameDriverEnableForAllAppsPreferenceControllerTest.java
View File

@@ -71,11 +71,11 @@ public class GameDriverEnableForAllAppsPreferenceControllerTest {
mResolver = mContext.getContentResolver(); mResolver = mContext.getContentResolver();
final Resources resources = mContext.getResources(); final Resources resources = mContext.getResources();
mPreferenceDefault = resources.getString(R.string.game_driver_app_preference_default); mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
mPreferenceGameDriver = mPreferenceGameDriver =
resources.getString(R.string.game_driver_app_preference_game_driver); resources.getString(R.string.graphics_driver_app_preference_game_driver);
mPreferencePrereleaseDriver = mPreferencePrereleaseDriver =
resources.getString(R.string.game_driver_app_preference_prerelease_driver); resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1); Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
Settings.Global.putInt( Settings.Global.putInt(

6
tests/uitests/assets/search_results_list
View File

@@ -224,7 +224,7 @@ Emergency information;emergency_info
Enable Bluetooth HCI snoop log;bt_hci_snoop_log Enable Bluetooth HCI snoop log;bt_hci_snoop_log
Enable GPU debug layers;enable_gpu_debug_layers Enable GPU debug layers;enable_gpu_debug_layers
Enable Wi-Fi Verbose Logging;wifi_verbose_logging Enable Wi-Fi Verbose Logging;wifi_verbose_logging
Enable for all apps;game_driver_all_apps_preference Enable for all apps;graphics_driver_all_apps_preference
Enable freeform windows;enable_freeform_support Enable freeform windows;enable_freeform_support
Enable view attribute inspection;debug_view_attributes Enable view attribute inspection;debug_view_attributes
Encrypt phone;encryption_and_credentials_encryption_status Encrypt phone;encryption_and_credentials_encryption_status
@@ -256,7 +256,7 @@ Force allow apps on external;force_allow_on_external
Force desktop mode;force_desktop_mode_on_external_displays Force desktop mode;force_desktop_mode_on_external_displays
Force full GNSS measurements;enable_gnss_raw_meas_full_tracking Force full GNSS measurements;enable_gnss_raw_meas_full_tracking
Free up space;storage_settings_free_space Free up space;storage_settings_free_space
Game Driver Preferences;game_driver_settings Graphics Driver Preferences;graphics_driver_settings
Games;pref_games Games;pref_games
Gestures;gesture_settings Gestures;gesture_settings
Gestures;gesture_settings_screen Gestures;gesture_settings_screen
@@ -612,7 +612,7 @@ Wait for debugger;wait_for_debugger
Wallpaper;wallpaper Wallpaper;wallpaper
Wallpapers;wallpaper_attributions Wallpapers;wallpaper_attributions
WebView implementation;select_webview_provider WebView implementation;select_webview_provider
When Game Driver is turned on, you can pick to use the updated graphics driver for Apps installed on the device.;game_driver_footer When there are multiple graphics drivers, you can pick to use the updated graphics driver for Apps installed on the device.;graphics_driver_footer
When device is in VR;vr_display_pref When device is in VR;vr_display_pref
When to start;when_to_start When to start;when_to_start
Wi-Fi;main_toggle_wifi Wi-Fi;main_toggle_wifi