From c2dfba01ca5dc94a00ed5d7b6aa2ba20759459fd Mon Sep 17 00:00:00 2001
From: Peiyong Lin <lpy@google.com>
Date: Tue, 23 Jul 2019 10:27:47 -0700
Subject: [PATCH] Remove prerelease driver option from Settings UI.

BUG: 134881329
Test: Verified with Settings UI.
Change-Id: Id610cbaec9b9a5a8be201e7952cb7715d2fe2eb4
---
 res/values/strings.xml                                         |  2 --
 .../gamedriver/GameDriverAppPreferenceControllerTest.java      | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bed96d8081..41e90ac0af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10664,13 +10664,11 @@
     <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>
-        <item>@string/game_driver_app_preference_prerelease_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_prerelease_driver</item>
         <item>@string/game_driver_app_preference_system</item>
     </string-array>
 
diff --git a/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
index f007ce257a..dd5af2b604 100644
--- a/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/gamedriver/GameDriverAppPreferenceControllerTest.java
@@ -56,8 +56,7 @@ public class GameDriverAppPreferenceControllerTest {
 
     private static final int DEFAULT = 0;
     private static final int GAME_DRIVER = 1;
-    private static final int PRERELEASE_DRIVER = 2;
-    private static final int SYSTEM = 3;
+    private static final int SYSTEM = 2;
     private static final String TEST_APP_NAME = "testApp";
     private static final String TEST_PKG_NAME = "testPkg";
 
@@ -80,6 +79,7 @@ public class GameDriverAppPreferenceControllerTest {
     private GameDriverAppPreferenceController mController;
     private CharSequence[] mValueList;
     private String mDialogTitle;
+    private String mPreferencePrereleaseDriver;
 
     @Before
     public void setUp() {
@@ -89,6 +89,8 @@ public class GameDriverAppPreferenceControllerTest {
         mValueList =
                 mContext.getResources().getStringArray(R.array.game_driver_app_preference_values);
         mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title);
+        mPreferencePrereleaseDriver =
+                mContext.getResources().getString(R.string.game_driver_app_preference_prerelease_driver);
     }
 
     @Test
@@ -207,9 +209,7 @@ public class GameDriverAppPreferenceControllerTest {
         assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
         assertThat(preference.getEntries()).isEqualTo(mValueList);
         assertThat(preference.getEntryValues()).isEqualTo(mValueList);
-        assertThat(preference.getEntry()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mPreferencePrereleaseDriver);
     }
 
     @Test
-- 
2.11.0