packages/apps/Settings
リビジョン | 81fb5e28c1c6151d8a6c9659d427dca4785ea5ec (tree) |
---|---|
日時 | 2019-07-25 13:12:54 |
作者 | android-build-team Robot <android-build-team-robot@goog...> |
コミッター | android-build-team Robot |
Merge cherrypicks of [8828839, 8824129, 8828883, 8828885, 8828888, 8828891, 8829076, 8828998, 8828999, 8828607, 8828957] into qt-release
Change-Id: Idb76a2a8d5818e896f2590513c27c9a42c55e8f8
@@ -10664,13 +10664,11 @@ | ||
10664 | 10664 | <string-array name="game_driver_all_apps_preference_values"> |
10665 | 10665 | <item>@string/game_driver_app_preference_default</item> |
10666 | 10666 | <item>@string/game_driver_app_preference_game_driver</item> |
10667 | - <item>@string/game_driver_app_preference_prerelease_driver</item> | |
10668 | 10667 | </string-array> |
10669 | 10668 | <!-- All the values for Game Driver app preference [CHAR LIMIT=50] --> |
10670 | 10669 | <string-array name="game_driver_app_preference_values"> |
10671 | 10670 | <item>@string/game_driver_app_preference_default</item> |
10672 | 10671 | <item>@string/game_driver_app_preference_game_driver</item> |
10673 | - <item>@string/game_driver_app_preference_prerelease_driver</item> | |
10674 | 10672 | <item>@string/game_driver_app_preference_system</item> |
10675 | 10673 | </string-array> |
10676 | 10674 |
@@ -56,8 +56,7 @@ public class GameDriverAppPreferenceControllerTest { | ||
56 | 56 | |
57 | 57 | private static final int DEFAULT = 0; |
58 | 58 | private static final int GAME_DRIVER = 1; |
59 | - private static final int PRERELEASE_DRIVER = 2; | |
60 | - private static final int SYSTEM = 3; | |
59 | + private static final int SYSTEM = 2; | |
61 | 60 | private static final String TEST_APP_NAME = "testApp"; |
62 | 61 | private static final String TEST_PKG_NAME = "testPkg"; |
63 | 62 |
@@ -80,6 +79,7 @@ public class GameDriverAppPreferenceControllerTest { | ||
80 | 79 | private GameDriverAppPreferenceController mController; |
81 | 80 | private CharSequence[] mValueList; |
82 | 81 | private String mDialogTitle; |
82 | + private String mPreferencePrereleaseDriver; | |
83 | 83 | |
84 | 84 | @Before |
85 | 85 | public void setUp() { |
@@ -89,6 +89,8 @@ public class GameDriverAppPreferenceControllerTest { | ||
89 | 89 | mValueList = |
90 | 90 | mContext.getResources().getStringArray(R.array.game_driver_app_preference_values); |
91 | 91 | mDialogTitle = mContext.getResources().getString(R.string.game_driver_app_preference_title); |
92 | + mPreferencePrereleaseDriver = | |
93 | + mContext.getResources().getString(R.string.game_driver_app_preference_prerelease_driver); | |
92 | 94 | } |
93 | 95 | |
94 | 96 | @Test |
@@ -207,9 +209,7 @@ public class GameDriverAppPreferenceControllerTest { | ||
207 | 209 | assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle); |
208 | 210 | assertThat(preference.getEntries()).isEqualTo(mValueList); |
209 | 211 | assertThat(preference.getEntryValues()).isEqualTo(mValueList); |
210 | - assertThat(preference.getEntry()).isEqualTo(mValueList[PRERELEASE_DRIVER]); | |
211 | - assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]); | |
212 | - assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]); | |
212 | + assertThat(preference.getSummary()).isEqualTo(mPreferencePrereleaseDriver); | |
213 | 213 | } |
214 | 214 | |
215 | 215 | @Test |