Merge "resolve merge conflicts of 23f196f347b7 to master" (9bf6c8a2) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+30 −0

Original line number	Diff line number	Diff line
		@@ -2847,4 +2847,34 @@
		notification. If false, then the expand icon has to be clicked in order for the expand
		to occur. The expand button will have increased touch boundaries to accomodate this. -->
		<bool name="config_notificationHeaderClickableForExpand">false</bool>

		<!-- Configuration for automotive -->
		<bool name="enable_pbap_pce_profile">false</bool>

		<!-- Default data warning level in mb -->
		<integer name="default_data_warning_level_mb">2048</integer>

		<!-- Whether to send a custom package name with the PSD.-->
		<bool name="config_sendPackageName">false</bool>

		<!-- Name for the set of keys associating package names -->
		<string name="config_helpPackageNameKey" translatable="false"></string>

		<!-- Name for the set of values of package names -->
		<string name="config_helpPackageNameValue" translatable="false"></string>

		<!-- Intent key for the package name keys -->
		<string name="config_helpIntentExtraKey" translatable="false"></string>

		<!-- Intent key for package name values -->
		<string name="config_helpIntentNameKey" translatable="false"></string>

		<!-- Intent key for the package name keys -->
		<string name="config_feedbackIntentExtraKey" translatable="false"></string>

		<!-- Intent key for package name values -->
		<string name="config_feedbackIntentNameKey" translatable="false"></string>

		<!-- The apps that need to be hidden when they are disabled -->
		<string-array name="config_hideWhenDisabled_packageNames"></string-array>
		</resources>

core/res/res/values/symbols.xml

+14 −0

Original line number	Diff line number	Diff line
		@@ -2994,4 +2994,18 @@
		<java-symbol type="bool" name="config_quickSettingsSupported" />

		<java-symbol type="style" name="Theme.DeviceDefault.QuickSettings" />

		<java-symbol type="bool" name="enable_pbap_pce_profile" />

		<java-symbol type="integer" name="default_data_warning_level_mb" />

		<java-symbol type="bool" name="config_sendPackageName" />
		<java-symbol type="string" name="config_helpPackageNameKey" />
		<java-symbol type="string" name="config_helpPackageNameValue" />
		<java-symbol type="string" name="config_helpIntentExtraKey" />
		<java-symbol type="string" name="config_helpIntentNameKey" />
		<java-symbol type="string" name="config_feedbackIntentExtraKey" />
		<java-symbol type="string" name="config_feedbackIntentNameKey" />

		<java-symbol type="array" name="config_hideWhenDisabled_packageNames" />
		</resources>

packages/SettingsLib/res/values/config.xml

deleted100755 → 0

+0 −49

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2016, 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.
		*/
		-->
		<resources>
		<!-- Configuration for automotive -->
		<bool name="enable_pbap_pce_profile">false</bool>

		<!-- Default data warning level in mb -->
		<integer name="default_data_warning_level_mb">2048</integer>

		<!-- Whether to send a custom package name with the PSD.-->
		<bool name="config_sendPackageName">false</bool>

		<!-- Name for the set of keys associating package names -->
		<string name="config_helpPackageNameKey" translatable="false"></string>

		<!-- Name for the set of values of package names -->
		<string name="config_helpPackageNameValue" translatable="false"></string>

		<!-- Intent key for the package name keys -->
		<string name="config_helpIntentExtraKey" translatable="false"></string>

		<!-- Intent key for package name values -->
		<string name="config_helpIntentNameKey" translatable="false"></string>

		<!-- Intent key for the package name keys -->
		<string name="config_feedbackIntentExtraKey" translatable="false"></string>

		<!-- Intent key for package name values -->
		<string name="config_feedbackIntentNameKey" translatable="false"></string>

		<!-- The apps that need to be hided when they are disabled -->
		<string-array name="config_hideWhenDisabled_packageNames"></string-array>
		</resources>
		No newline at end of file

packages/SettingsLib/src/com/android/settingslib/HelpUtils.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -180,21 +180,24 @@ public class HelpUtils {
		}

		Resources resources = context.getResources();
		boolean includePackageName = resources.getBoolean(R.bool.config_sendPackageName);
		boolean includePackageName =
		resources.getBoolean(com.android.internal.R.bool.config_sendPackageName);

		if (sendPackageName && includePackageName) {
		String[] packageNameKey =
		{resources.getString(R.string.config_helpPackageNameKey)};
		{resources.getString(com.android.internal.R.string.config_helpPackageNameKey)};
		String[] packageNameValue =
		{resources.getString(R.string.config_helpPackageNameValue)};
		{resources.getString(
		com.android.internal.R.string.config_helpPackageNameValue)};
		String helpIntentExtraKey =
		resources.getString(R.string.config_helpIntentExtraKey);
		resources.getString(com.android.internal.R.string.config_helpIntentExtraKey);
		String helpIntentNameKey =
		resources.getString(R.string.config_helpIntentNameKey);
		resources.getString(com.android.internal.R.string.config_helpIntentNameKey);
		String feedbackIntentExtraKey =
		resources.getString(R.string.config_feedbackIntentExtraKey);
		resources.getString(
		com.android.internal.R.string.config_feedbackIntentExtraKey);
		String feedbackIntentNameKey =
		resources.getString(R.string.config_feedbackIntentNameKey);
		resources.getString(com.android.internal.R.string.config_feedbackIntentNameKey);
		intent.putExtra(helpIntentExtraKey, packageNameKey);
		intent.putExtra(helpIntentNameKey, packageNameValue);
		intent.putExtra(feedbackIntentExtraKey, packageNameKey);

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -50,8 +50,8 @@ import android.util.IconDrawableFactory;
		import android.util.Log;
		import android.util.SparseArray;

		import com.android.internal.R;
		import com.android.internal.util.ArrayUtils;
		import com.android.settingslib.R;

		import java.io.File;
		import java.io.IOException;
		@@ -1276,8 +1276,7 @@ public class ApplicationsState {
		return true;
		} else {
		this.mounted = false;
		this.icon = context.getDrawable(
		com.android.internal.R.drawable.sym_app_on_sd_unavailable_icon);
		this.icon = context.getDrawable(R.drawable.sym_app_on_sd_unavailable_icon);
		}
		} else if (!this.mounted) {
		// If the app wasn't mounted but is now mounted, reload