Merge "Rename recently added symbols to camel-case" (125f042c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -222,7 +222,7 @@ package android {
	}		}

	public static final class R.dimen {		public static final class R.dimen {
	field public static final int config_restricted_icon_size = 17104903; // 0x1050007		field public static final int config_restrictedIconSize = 17104903; // 0x1050007
	}		}

	public static final class R.drawable {		public static final class R.drawable {
	@@ -235,12 +235,12 @@ package android {
	}		}

	public static final class R.string {		public static final class R.string {
	field public static final int config_feedback_intent_extra_key = 17039391; // 0x104001f		field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f
	field public static final int config_feedback_intent_name_key = 17039392; // 0x1040020		field public static final int config_feedbackIntentNameKey = 17039392; // 0x1040020
	field public static final int config_help_intent_extra_key = 17039389; // 0x104001d		field public static final int config_helpIntentExtraKey = 17039389; // 0x104001d
	field public static final int config_help_intent_name_key = 17039390; // 0x104001e		field public static final int config_helpIntentNameKey = 17039390; // 0x104001e
	field public static final int config_help_package_name_key = 17039387; // 0x104001b		field public static final int config_helpPackageNameKey = 17039387; // 0x104001b
	field public static final int config_help_package_name_value = 17039388; // 0x104001c		field public static final int config_helpPackageNameValue = 17039388; // 0x104001c
	}		}

	public static final class R.style {		public static final class R.style {

core/res/res/values/config.xml

+7 −7

core/res/res/values/public.xml

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -2930,17 +2930,17 @@

	<public-group type="string" first-id="0x0104001b">		<public-group type="string" first-id="0x0104001b">
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_help_package_name_key" />		<public name="config_helpPackageNameKey" />
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_help_package_name_value" />		<public name="config_helpPackageNameValue" />
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_help_intent_extra_key" />		<public name="config_helpIntentExtraKey" />
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_help_intent_name_key" />		<public name="config_helpIntentNameKey" />
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_feedback_intent_extra_key" />		<public name="config_feedbackIntentExtraKey" />
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_feedback_intent_name_key" />		<public name="config_feedbackIntentNameKey" />
	</public-group>		</public-group>

	<public-group type="bool" first-id="0x01110000">		<public-group type="bool" first-id="0x01110000">
	@@ -2950,7 +2950,7 @@

	<public-group type="dimen" first-id="0x01050007">		<public-group type="dimen" first-id="0x01050007">
	<!-- @hide @SystemApi -->		<!-- @hide @SystemApi -->
	<public name="config_restricted_icon_size" />		<public name="config_restrictedIconSize" />
	</public-group>		</public-group>

	<!-- ===============================================================		<!-- ===============================================================

core/res/res/values/symbols.xml

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -3270,12 +3270,12 @@
	<java-symbol type="integer" name="default_data_warning_level_mb" />		<java-symbol type="integer" name="default_data_warning_level_mb" />
	<java-symbol type="bool" name="config_useVideoPauseWorkaround" />		<java-symbol type="bool" name="config_useVideoPauseWorkaround" />
	<java-symbol type="bool" name="config_sendPackageName" />		<java-symbol type="bool" name="config_sendPackageName" />
	<java-symbol type="string" name="config_help_package_name_key" />		<java-symbol type="string" name="config_helpPackageNameKey" />
	<java-symbol type="string" name="config_help_package_name_value" />		<java-symbol type="string" name="config_helpPackageNameValue" />
	<java-symbol type="string" name="config_help_intent_extra_key" />		<java-symbol type="string" name="config_helpIntentExtraKey" />
	<java-symbol type="string" name="config_help_intent_name_key" />		<java-symbol type="string" name="config_helpIntentNameKey" />
	<java-symbol type="string" name="config_feedback_intent_extra_key" />		<java-symbol type="string" name="config_feedbackIntentExtraKey" />
	<java-symbol type="string" name="config_feedback_intent_name_key" />		<java-symbol type="string" name="config_feedbackIntentNameKey" />

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

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -3367,22 +3367,22 @@
	<bool name="config_sendPackageName">false</bool>		<bool name="config_sendPackageName">false</bool>

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

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

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

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

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

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

	<!-- The apps that need to be hidden when they are disabled -->		<!-- The apps that need to be hidden when they are disabled -->
	<string-array name="config_hideWhenDisabled_packageNames"></string-array>		<string-array name="config_hideWhenDisabled_packageNames"></string-array>
	@@ -3487,7 +3487,7 @@
	<string name="config_headlineFontFamilyMedium">@string/font_family_button_material</string>		<string name="config_headlineFontFamilyMedium">@string/font_family_button_material</string>

	<!-- Size of icon shown beside a preference locked by admin -->		<!-- Size of icon shown beside a preference locked by admin -->
	<dimen name="config_restricted_icon_size">@dimen/restricted_icon_size_material</dimen>		<dimen name="config_restrictedIconSize">@dimen/restricted_icon_size_material</dimen>

	<string translatable="false" name="config_batterySaverDeviceSpecificConfig"></string>		<string translatable="false" name="config_batterySaverDeviceSpecificConfig"></string>

Original line number	Original line	Diff line number	Diff line
	@@ -187,17 +187,17 @@ public class HelpUtils {

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