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

Remove prerelease driver option from Settings UI.

Browse Source 
BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
This commit is contained in:
Peiyong Lin
2019-07-23 10:27:47 -07:00
parent 28736bee5d
commit c2dfba01ca
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -10664,13 +10664,11 @@
<string-array name="game_driver_all_apps_preference_values"> <string-array name="game_driver_all_apps_preference_values">
<item>@string/game_driver_app_preference_default</item> <item>@string/game_driver_app_preference_default</item>
<item>@string/game_driver_app_preference_game_driver</item> <item>@string/game_driver_app_preference_game_driver</item>
<item>@string/game_driver_app_preference_prerelease_driver</item>
</string-array> </string-array>
<!-- All the values for Game Driver app preference [CHAR LIMIT=50] --> <!-- All the values for Game Driver app preference [CHAR LIMIT=50] -->
<string-array name="game_driver_app_preference_values"> <string-array name="game_driver_app_preference_values">
<item>@string/game_driver_app_preference_default</item> <item>@string/game_driver_app_preference_default</item>
<item>@string/game_driver_app_preference_game_driver</item> <item>@string/game_driver_app_preference_game_driver</item>
<item>@string/game_driver_app_preference_prerelease_driver</item>
<item>@string/game_driver_app_preference_system</item> <item>@string/game_driver_app_preference_system</item>
</string-array> </string-array>

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

@@ -56,8 +56,7 @@ public class GameDriverAppPreferenceControllerTest {
private static final int DEFAULT = 0; private static final int DEFAULT = 0;
private static final int GAME_DRIVER = 1; private static final int GAME_DRIVER = 1;
private static final int PRERELEASE_DRIVER = 2; private static final int SYSTEM = 2;
private static final int SYSTEM = 3;
private static final String TEST_APP_NAME = "testApp"; private static final String TEST_APP_NAME = "testApp";
private static final String TEST_PKG_NAME = "testPkg"; private static final String TEST_PKG_NAME = "testPkg";
@@ -80,6 +79,7 @@ public class GameDriverAppPreferenceControllerTest {
private GameDriverAppPreferenceController mController; private GameDriverAppPreferenceController mController;
private CharSequence[] mValueList; private CharSequence[] mValueList;
private String mDialogTitle; private String mDialogTitle;
private String mPreferencePrereleaseDriver;
@Before @Before
public void setUp() { public void setUp() {
@@ -89,6 +89,8 @@ public class GameDriverAppPreferenceControllerTest {
mValueList = mValueList =
mContext.getResources().getStringArray(R.array.game_driver_app_preference_values); mContext.getResources().getStringArray(R.array.game_driver_app_preference_values);
mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title); mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title);
mPreferencePrereleaseDriver =
mContext.getResources().getString(R.string.game_driver_app_preference_prerelease_driver);
} }
@Test @Test
@@ -207,9 +209,7 @@ public class GameDriverAppPreferenceControllerTest {
assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle); assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
assertThat(preference.getEntries()).isEqualTo(mValueList); assertThat(preference.getEntries()).isEqualTo(mValueList);
assertThat(preference.getEntryValues()).isEqualTo(mValueList); assertThat(preference.getEntryValues()).isEqualTo(mValueList);
assertThat(preference.getEntry()).isEqualTo(mValueList[PRERELEASE_DRIVER]); assertThat(preference.getSummary()).isEqualTo(mPreferencePrereleaseDriver);
assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
} }
@Test @Test