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

Merge "Rename updatable graphics driver to Game Update Package."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-03 23:06:35 +00:00
committed by Android (Google) Code Review
parent 45ae063526 e70d103266
commit fea78b800c
6 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/values/strings.xml
View File

@@ -10042,12 +10042,12 @@
<!-- 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>
<!-- UI debug setting: select an app to use updated graphics driver [CHAR LIMIT=100] --> <!-- UI debug setting: select an app to use Game Update Package [CHAR LIMIT=100] -->
<string name="updated_gfx_driver_dev_opt_in_app">Select app to use updated graphics driver</string> <string name="gup_dev_opt_in_app">Use Game Update Package</string>
<!-- UI debug setting: no app selected to use updated GPU driver [CHAR LIMIT=100] --> <!-- UI debug setting: no app selected to use Game Update Package [CHAR LIMIT=100] -->
<string name="updated_gfx_driver_dev_opt_in_app_not_set">No selected app to use updated graphics driver</string> <string name="gup_dev_opt_in_app_not_set">No selected app</string>
<!-- UI debug setting: app selected to use updated graphics driver [CHAR LIMIT=NONE] --> <!-- UI debug setting: app selected to use Game Update Package [CHAR LIMIT=NONE] -->
<string name="updated_gfx_driver_dev_opt_in_app_set">Opt in application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string> <string name="gup_dev_opt_in_app_set"><xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
<!-- Slices Strings --> <!-- Slices Strings -->

7
res/xml/development_settings.xml
View File

@@ -424,9 +424,10 @@
android:summary="%s" android:summary="%s"
android:title="@string/simulate_color_space" /> android:title="@string/simulate_color_space" />
<Preference android:key="updated_gfx_driver_dev_opt_in_app" <Preference
android:summary="@string/updated_gfx_driver_dev_opt_in_app_summary" android:title="@string/gup_dev_opt_in_app"
android:title="@string/updated_gfx_driver_dev_opt_in_app" /> android:key="gup_dev_opt_in_app"
android:summary="@string/gup_dev_opt_in_app_summary" />
</PreferenceCategory> </PreferenceCategory>

2
src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
View File

@@ -32,5 +32,5 @@ public interface DevelopmentOptionsActivityRequestCodes {
int REQUEST_CODE_ANGLE_DRIVER_VALUES = 5; int REQUEST_CODE_ANGLE_DRIVER_VALUES = 5;
int REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = 6; int REQUEST_CODE_GUP_DEV_OPT_IN_APPS = 6;
} }

2
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -423,7 +423,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new SelectDebugAppPreferenceController(context, fragment)); controllers.add(new SelectDebugAppPreferenceController(context, fragment));
controllers.add(new WaitForDebuggerPreferenceController(context)); controllers.add(new WaitForDebuggerPreferenceController(context));
controllers.add(new EnableGpuDebugLayersPreferenceController(context)); controllers.add(new EnableGpuDebugLayersPreferenceController(context));
controllers.add(new UpdatedGfxDriverDevOptInPreferenceController(context, fragment)); controllers.add(new GameUpdatePackageDevOptInPreferenceController(context, fragment));
controllers.add(new VerifyAppsOverUsbPreferenceController(context)); controllers.add(new VerifyAppsOverUsbPreferenceController(context));
controllers.add(new LogdSizePreferenceController(context)); controllers.add(new LogdSizePreferenceController(context));
controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle)); controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));

33
src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceController.java → src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java
View File

@@ -17,7 +17,7 @@
package com.android.settings.development; package com.android.settings.development;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP; .REQUEST_CODE_GUP_DEV_OPT_IN_APPS;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@@ -33,17 +33,16 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
// TODO(b/119221883): Need to override isAvailable() to return false when updatable graphics driver is not supported. // TODO(b/119221883): Need to override isAvailable() to return false when updatable graphics driver is not supported.
public class UpdatedGfxDriverDevOptInPreferenceController public class GameUpdatePackageDevOptInPreferenceController
extends DeveloperOptionsPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin, OnActivityResultListener { implements PreferenceControllerMixin, OnActivityResultListener {
private static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY = private static final String GUP_DEV_OPT_IN_APP_KEY = "gup_dev_opt_in_app";
"updated_gfx_driver_dev_opt_in_app";
private final DevelopmentSettingsDashboardFragment mFragment; private final DevelopmentSettingsDashboardFragment mFragment;
private final PackageManager mPackageManager; private final PackageManager mPackageManager;
public UpdatedGfxDriverDevOptInPreferenceController(Context context, public GameUpdatePackageDevOptInPreferenceController(Context context,
DevelopmentSettingsDashboardFragment fragment) { DevelopmentSettingsDashboardFragment fragment) {
super(context); super(context);
mFragment = fragment; mFragment = fragment;
@@ -52,16 +51,15 @@ public class UpdatedGfxDriverDevOptInPreferenceController
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY; return GUP_DEV_OPT_IN_APP_KEY;
} }
@Override @Override
public boolean handlePreferenceTreeClick(Preference preference) { public boolean handlePreferenceTreeClick(Preference preference) {
if (UPDATED_GFX_DRIVER_DEV_OPT_IN_APP_KEY.equals(preference.getKey())) { if (GUP_DEV_OPT_IN_APP_KEY.equals(preference.getKey())) {
// pass it on to settings // pass it on to settings
final Intent intent = getActivityStartIntent(); final Intent intent = getActivityStartIntent();
mFragment.startActivityForResult(intent, mFragment.startActivityForResult(intent, REQUEST_CODE_GUP_DEV_OPT_IN_APPS);
REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP);
return true; return true;
} }
return false; return false;
@@ -74,12 +72,12 @@ public class UpdatedGfxDriverDevOptInPreferenceController
@Override @Override
public boolean onActivityResult(int requestCode, int resultCode, Intent data) { public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode != REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP if (requestCode != REQUEST_CODE_GUP_DEV_OPT_IN_APPS
|| resultCode != Activity.RESULT_OK) { || resultCode != Activity.RESULT_OK) {
return false; return false;
} }
Settings.Global.putString(mContext.getContentResolver(), Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, data.getAction()); Settings.Global.GUP_DEV_OPT_IN_APPS, data.getAction());
updatePreferenceSummary(); updatePreferenceSummary();
return true; return true;
} }
@@ -88,7 +86,7 @@ public class UpdatedGfxDriverDevOptInPreferenceController
protected void onDeveloperOptionsSwitchDisabled() { protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled(); super.onDeveloperOptionsSwitchDisabled();
mPreference.setSummary(mContext.getResources().getString( mPreference.setSummary(mContext.getResources().getString(
R.string.updated_gfx_driver_dev_opt_in_app_not_set)); R.string.gup_dev_opt_in_app_not_set));
} }
@VisibleForTesting @VisibleForTesting
@@ -99,15 +97,14 @@ public class UpdatedGfxDriverDevOptInPreferenceController
} }
private void updatePreferenceSummary() { private void updatePreferenceSummary() {
final String updatedGfxDriverDevOptInApp = Settings.Global.getString( final String optInApp = Settings.Global.getString(
mContext.getContentResolver(), Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); mContext.getContentResolver(), Settings.Global.GUP_DEV_OPT_IN_APPS);
if (updatedGfxDriverDevOptInApp != null && !updatedGfxDriverDevOptInApp.isEmpty()) { if (optInApp != null && !optInApp.isEmpty()) {
mPreference.setSummary(mContext.getResources().getString( mPreference.setSummary(mContext.getResources().getString(
R.string.updated_gfx_driver_dev_opt_in_app_set, R.string.gup_dev_opt_in_app_set, getAppLabel(optInApp)));
getAppLabel(updatedGfxDriverDevOptInApp)));
} else { } else {
mPreference.setSummary(mContext.getResources().getString( mPreference.setSummary(mContext.getResources().getString(
R.string.updated_gfx_driver_dev_opt_in_app_not_set)); R.string.gup_dev_opt_in_app_not_set));
} }
} }

32
tests/robotests/src/com/android/settings/development/UpdatedGfxDriverDevOptInPreferenceControllerTest.java → tests/robotests/src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.development; package com.android.settings.development;
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP; import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_GUP_DEV_OPT_IN_APPS;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
@@ -44,7 +44,7 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class UpdatedGfxDriverDevOptInPreferenceControllerTest { public class GameUpdatePackageDevOptInPreferenceControllerTest {
@Mock @Mock
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
@@ -53,13 +53,13 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest {
private Context mContext; private Context mContext;
private Preference mPreference; private Preference mPreference;
private UpdatedGfxDriverDevOptInPreferenceController mController; private GameUpdatePackageDevOptInPreferenceController mController;
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application; mContext = RuntimeEnvironment.application;
mController = spy(new UpdatedGfxDriverDevOptInPreferenceController(mContext, mFragment)); mController = spy(new GameUpdatePackageDevOptInPreferenceController(mContext, mFragment));
mPreference = new Preference(mContext); mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey()); mPreference.setKey(mController.getPreferenceKey());
@@ -75,18 +75,19 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest {
mController.handlePreferenceTreeClick(mPreference); mController.handlePreferenceTreeClick(mPreference);
verify(mFragment).startActivityForResult(activityStartIntent, verify(mFragment).startActivityForResult(activityStartIntent,
REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); REQUEST_CODE_GUP_DEV_OPT_IN_APPS);
} }
@Test @Test
public void updateState_foobarAppSelected_shouldUpdateSummaryWithUpdatedDriverDevOptInAppLabel() { public void updateState_foobarAppSelected_shouldUpdateSummaryWithGUPDevOptInAppLabel() {
final String selectedApp = "foobar"; final String selectedApp = "foobar";
final ContentResolver contentResolver = mContext.getContentResolver(); final ContentResolver contentResolver = mContext.getContentResolver();
Settings.Global.putString(contentResolver, Settings.Global.putString(contentResolver,
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, selectedApp); Settings.Global.GUP_DEV_OPT_IN_APPS, selectedApp);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_set, selectedApp)); assertThat(mPreference.getSummary()).isEqualTo(
mContext.getString(R.string.gup_dev_opt_in_app_set, selectedApp));
} }
@Test @Test
@@ -94,23 +95,25 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest {
final String selectedApp = null; final String selectedApp = null;
final ContentResolver contentResolver = mContext.getContentResolver(); final ContentResolver contentResolver = mContext.getContentResolver();
Settings.Global.putString(contentResolver, Settings.Global.putString(contentResolver,
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, selectedApp); Settings.Global.GUP_DEV_OPT_IN_APPS, selectedApp);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_not_set)); assertThat(mPreference.getSummary()).isEqualTo(
mContext.getString(R.string.gup_dev_opt_in_app_not_set));
} }
@Test @Test
public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithUpdatedDriverDevOptInLabel() { public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithGUPDevOptInLabel() {
Intent activityResultIntent = new Intent(mContext, AppPicker.class); Intent activityResultIntent = new Intent(mContext, AppPicker.class);
final String appLabel = "foobar"; final String appLabel = "foobar";
activityResultIntent.setAction(appLabel); activityResultIntent.setAction(appLabel);
final boolean result = mController final boolean result = mController
.onActivityResult(REQUEST_CODE_UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, Activity.RESULT_OK, .onActivityResult(REQUEST_CODE_GUP_DEV_OPT_IN_APPS, Activity.RESULT_OK,
activityResultIntent); activityResultIntent);
assertThat(result).isTrue(); assertThat(result).isTrue();
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_set, appLabel)); assertThat(mPreference.getSummary()).isEqualTo(
mContext.getString(R.string.gup_dev_opt_in_app_set, appLabel));
} }
@Test @Test
@@ -124,6 +127,7 @@ public class UpdatedGfxDriverDevOptInPreferenceControllerTest {
mController.onDeveloperOptionsSwitchDisabled(); mController.onDeveloperOptionsSwitchDisabled();
assertThat(mPreference.isEnabled()).isFalse(); assertThat(mPreference.isEnabled()).isFalse();
assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.updated_gfx_driver_dev_opt_in_app_not_set)); assertThat(mPreference.getSummary()).isEqualTo(
mContext.getString(R.string.gup_dev_opt_in_app_not_set));
} }
} }