Merge changes from topic "GameDriver" (1d518f42) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -9982,6 +9982,13 @@
		show both names, with the directory name wrapped in parenthesis -->
		<string name="directory_on_volume"><xliff:g id="volume" example="SD Card">%1$s</xliff:g> (<xliff:g id="directory" example="Movies">%2$s</xliff:g>)</string>

		<!-- UI debug setting: select an app to use Game Update Package [CHAR LIMIT=100] -->
		<string name="gup_dev_opt_in_app">Use Game Update Package</string>
		<!-- UI debug setting: no app selected to use Game Update Package [CHAR LIMIT=100] -->
		<string name="gup_dev_opt_in_app_not_set">No selected app</string>
		<!-- UI debug setting: app selected to use Game Update Package [CHAR LIMIT=NONE] -->
		<string name="gup_dev_opt_in_app_set"><xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>

		<!-- Slices Strings -->

		<!-- Summary text on a card explaining that a setting does not exist / is not supported on the device [CHAR_LIMIT=NONE]-->

res/xml/development_settings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,11 @@
		android:summary="%s"
		android:title="@string/simulate_color_space" />

		<Preference
		android:title="@string/gup_dev_opt_in_app"
		android:key="gup_dev_opt_in_app"
		android:summary="@string/gup_dev_opt_in_app_summary" />

		</PreferenceCategory>

		<PreferenceCategory

src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -25,4 +25,6 @@ public interface DevelopmentOptionsActivityRequestCodes {
		int REQUEST_CODE_DEBUG_APP = 1;

		int REQUEST_MOCK_LOCATION_APP = 2;

		int REQUEST_CODE_GUP_DEV_OPT_IN_APPS = 6;
		}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -400,6 +400,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new SelectDebugAppPreferenceController(context, fragment));
		controllers.add(new WaitForDebuggerPreferenceController(context));
		controllers.add(new EnableGpuDebugLayersPreferenceController(context));
		controllers.add(new GameUpdatePackageDevOptInPreferenceController(context, fragment));
		controllers.add(new VerifyAppsOverUsbPreferenceController(context));
		controllers.add(new LogdSizePreferenceController(context));
		controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));

src/com/android/settings/development/GameUpdatePackageDevOptInPreferenceController.java

0 → 100644

+121 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.development;

		import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
		.REQUEST_CODE_GUP_DEV_OPT_IN_APPS;

		import android.app.Activity;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.provider.Settings;
		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		// TODO(b/119221883): Need to override isAvailable() to return false when updatable graphics driver is not supported.
		public class GameUpdatePackageDevOptInPreferenceController
		extends DeveloperOptionsPreferenceController
		implements PreferenceControllerMixin, OnActivityResultListener {

		private static final String GUP_DEV_OPT_IN_APP_KEY = "gup_dev_opt_in_app";

		private final DevelopmentSettingsDashboardFragment mFragment;
		private final PackageManager mPackageManager;

		public GameUpdatePackageDevOptInPreferenceController(Context context,
		DevelopmentSettingsDashboardFragment fragment) {
		super(context);
		mFragment = fragment;
		mPackageManager = mContext.getPackageManager();
		}

		@Override
		public String getPreferenceKey() {
		return GUP_DEV_OPT_IN_APP_KEY;
		}

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (GUP_DEV_OPT_IN_APP_KEY.equals(preference.getKey())) {
		// pass it on to settings
		final Intent intent = getActivityStartIntent();
		mFragment.startActivityForResult(intent, REQUEST_CODE_GUP_DEV_OPT_IN_APPS);
		return true;
		}
		return false;
		}

		@Override
		public void updateState(Preference preference) {
		updatePreferenceSummary();
		}

		@Override
		public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
		if (requestCode != REQUEST_CODE_GUP_DEV_OPT_IN_APPS
		\|\| resultCode != Activity.RESULT_OK) {
		return false;
		}
		Settings.Global.putString(mContext.getContentResolver(),
		Settings.Global.GUP_DEV_OPT_IN_APPS, data.getAction());
		updatePreferenceSummary();
		return true;
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		mPreference.setSummary(mContext.getResources().getString(
		R.string.gup_dev_opt_in_app_not_set));
		}

		@VisibleForTesting
		Intent getActivityStartIntent() {
		Intent intent = new Intent(mContext, AppPicker.class);
		intent.putExtra(AppPicker.EXTRA_DEBUGGABLE, true /* value */);
		return intent;
		}

		private void updatePreferenceSummary() {
		final String optInApp = Settings.Global.getString(
		mContext.getContentResolver(), Settings.Global.GUP_DEV_OPT_IN_APPS);
		if (optInApp != null && !optInApp.isEmpty()) {
		mPreference.setSummary(mContext.getResources().getString(
		R.string.gup_dev_opt_in_app_set, getAppLabel(optInApp)));
		} else {
		mPreference.setSummary(mContext.getResources().getString(
		R.string.gup_dev_opt_in_app_not_set));
		}
		}

		private String getAppLabel(String applicationPackageName) {
		try {
		final ApplicationInfo ai = mPackageManager.getApplicationInfo(applicationPackageName,
		PackageManager.GET_DISABLED_COMPONENTS);
		final CharSequence lab = mPackageManager.getApplicationLabel(ai);
		return lab != null ? lab.toString() : applicationPackageName;
		} catch (PackageManager.NameNotFoundException e) {
		return applicationPackageName;
		}
		}
		}