Android-x86
Fork

  • R/O
  • HTTP
  • SSH
  • HTTPS

packages-apps-Settings: コミット

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

変更サマリ

差分

--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10664,13 +10664,11 @@
1066410664 <string-array name="game_driver_all_apps_preference_values">
1066510665 <item>@string/game_driver_app_preference_default</item>
1066610666 <item>@string/game_driver_app_preference_game_driver</item>
10667- <item>@string/game_driver_app_preference_prerelease_driver</item>
1066810667 </string-array>
1066910668 <!-- All the values for Game Driver app preference [CHAR LIMIT=50] -->
1067010669 <string-array name="game_driver_app_preference_values">
1067110670 <item>@string/game_driver_app_preference_default</item>
1067210671 <item>@string/game_driver_app_preference_game_driver</item>
10673- <item>@string/game_driver_app_preference_prerelease_driver</item>
1067410672 <item>@string/game_driver_app_preference_system</item>
1067510673 </string-array>
1067610674
--- 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 {
5656
5757 private static final int DEFAULT = 0;
5858 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;
6160 private static final String TEST_APP_NAME = "testApp";
6261 private static final String TEST_PKG_NAME = "testPkg";
6362
@@ -80,6 +79,7 @@ public class GameDriverAppPreferenceControllerTest {
8079 private GameDriverAppPreferenceController mController;
8180 private CharSequence[] mValueList;
8281 private String mDialogTitle;
82+ private String mPreferencePrereleaseDriver;
8383
8484 @Before
8585 public void setUp() {
@@ -89,6 +89,8 @@ public class GameDriverAppPreferenceControllerTest {
8989 mValueList =
9090 mContext.getResources().getStringArray(R.array.game_driver_app_preference_values);
9191 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);
9294 }
9395
9496 @Test
@@ -207,9 +209,7 @@ public class GameDriverAppPreferenceControllerTest {
207209 assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
208210 assertThat(preference.getEntries()).isEqualTo(mValueList);
209211 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);
213213 }
214214
215215 @Test
旧リポジトリブラウザで表示