Merge changes from topic "angle_integration4" (dac739de) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -9941,6 +9941,13 @@
		<!-- UI debug setting: preference summary - describes the behavior of showing a dialog every time an app crashes [CHAR LIMIT=NONE] -->
		<string name="show_first_crash_dialog_summary">Show dialog every time an app crashes</string>

		<!-- UI debug setting: select current app to use ANGLE [CHAR LIMIT=100] -->
		<string name="angle_enabled_app">Select ANGLE enabled app</string>
		<!-- UI debug setting: no ANGLE enabled app has been set [CHAR LIMIT=100] -->
		<string name="angle_enabled_app_not_set">No ANGLE enabled application set</string>
		<!-- 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>

		<!-- Title for Directory Access settings -->
		<string name="directory_access">Directory access</string>
		<!-- Keywords for Directory Access settings -->

res/xml/development_settings.xml

+3 −0

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

		<Preference android:key="angle_enabled_app"
		android:title="@string/angle_enabled_app" />

		</PreferenceCategory>

		<PreferenceCategory

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

0 → 100644

+119 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 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_ANGLE_ENABLED_APP;

		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;

		public class AngleEnabledAppPreferenceController extends DeveloperOptionsPreferenceController
		implements PreferenceControllerMixin, OnActivityResultListener {

		private static final String ANGLE_ENABLED_APP_KEY = "angle_enabled_app";

		private final DevelopmentSettingsDashboardFragment mFragment;
		private final PackageManager mPackageManager;

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

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

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (ANGLE_ENABLED_APP_KEY.equals(preference.getKey())) {
		// pass it on to settings
		final Intent intent = getActivityStartIntent();
		mFragment.startActivityForResult(intent, REQUEST_CODE_ANGLE_ENABLED_APP);
		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_ANGLE_ENABLED_APP \|\| resultCode != Activity.RESULT_OK) {
		return false;
		}
		Settings.Global.putString(mContext.getContentResolver(), Settings.Global.ANGLE_ENABLED_APP,
		data.getAction());
		updatePreferenceSummary();
		return true;
		}

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

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

		private void updatePreferenceSummary() {
		final String angleEnabledApp = Settings.Global.getString(
		mContext.getContentResolver(), Settings.Global.ANGLE_ENABLED_APP);
		if (angleEnabledApp != null && angleEnabledApp.length() > 0) {
		mPreference.setSummary(mContext.getResources().getString(
		R.string.angle_enabled_app_set,
		getAppLabel(angleEnabledApp)));
		} else {
		mPreference.setSummary(mContext.getResources().getString(
		R.string.angle_enabled_app_not_set));
		}
		}

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

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -45,9 +45,11 @@ public class AppPicker extends ListActivity {
		public static final String EXTRA_REQUESTIING_PERMISSION
		= "com.android.settings.extra.REQUESTIING_PERMISSION";
		public static final String EXTRA_DEBUGGABLE = "com.android.settings.extra.DEBUGGABLE";
		public static final String EXTRA_NON_SYSTEM = "com.android.settings.extra.NON_SYSTEM";

		private String mPermissionName;
		private boolean mDebuggableOnly;
		private boolean mNonSystemOnly;

		@Override
		protected void onCreate(Bundle icicle) {
		@@ -55,6 +57,7 @@ public class AppPicker extends ListActivity {

		mPermissionName = getIntent().getStringExtra(EXTRA_REQUESTIING_PERMISSION);
		mDebuggableOnly = getIntent().getBooleanExtra(EXTRA_DEBUGGABLE, false);
		mNonSystemOnly = getIntent().getBooleanExtra(EXTRA_NON_SYSTEM, false);

		mAdapter = new AppListAdapter(this);
		if (mAdapter.getCount() <= 0) {
		@@ -113,6 +116,11 @@ public class AppPicker extends ListActivity {
		}
		}

		// Filter out apps that are system apps if requested
		if (mNonSystemOnly && ai.isSystemApp()) {
		continue;
		}

		// Filter out apps that do not request the permission if required.
		if (mPermissionName != null) {
		boolean requestsPermission = false;

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_ANGLE_ENABLED_APP = 3;
		}