From 9c7f51e67611e6a6a236be23f55671e71a525a8a Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Thu, 11 Oct 2018 11:30:35 -0700 Subject: [PATCH] Rename recently added symbols to camel-case Test: looked at help screen in settings make RunSettingsLibRoboTests Change-Id: Ife257ad1bbe43a42084fdf9d2718c8fc1465f170 Fixes: 116797641 --- api/system-current.txt | 14 +++++++------- core/res/res/values/config.xml | 14 +++++++------- core/res/res/values/public.xml | 14 +++++++------- core/res/res/values/symbols.xml | 12 ++++++------ .../src/com/android/settingslib/HelpUtils.java | 12 ++++++------ .../res/layout/restricted_icon.xml | 4 ++-- .../res/layout/restricted_switch_widget.xml | 4 ++-- .../settingslib/RestrictedLockUtilsInternal.java | 2 +- .../src/com/android/settingslib/HelpUtilsTest.java | 12 ++++++------ 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 6c98753b38e21..82d262c3cf63c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -222,7 +222,7 @@ package android { } 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 { @@ -235,12 +235,12 @@ package android { } public static final class R.string { - field public static final int config_feedback_intent_extra_key = 17039391; // 0x104001f - field public static final int config_feedback_intent_name_key = 17039392; // 0x1040020 - field public static final int config_help_intent_extra_key = 17039389; // 0x104001d - field public static final int config_help_intent_name_key = 17039390; // 0x104001e - field public static final int config_help_package_name_key = 17039387; // 0x104001b - field public static final int config_help_package_name_value = 17039388; // 0x104001c + field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f + field public static final int config_feedbackIntentNameKey = 17039392; // 0x1040020 + field public static final int config_helpIntentExtraKey = 17039389; // 0x104001d + field public static final int config_helpIntentNameKey = 17039390; // 0x104001e + field public static final int config_helpPackageNameKey = 17039387; // 0x104001b + field public static final int config_helpPackageNameValue = 17039388; // 0x104001c } public static final class R.style { diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index aeeba59b694b1..cb97a2a7d7cdc 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3367,22 +3367,22 @@ false - + - + - + - + - + - + @@ -3487,7 +3487,7 @@ @string/font_family_button_material - @dimen/restricted_icon_size_material + @dimen/restricted_icon_size_material diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 2e42e4ac27f33..95517186fe9ef 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2930,17 +2930,17 @@ - + - + - + - + - + - + @@ -2950,7 +2950,7 @@ - + diff --git a/packages/SettingsLib/res/layout/restricted_switch_widget.xml b/packages/SettingsLib/res/layout/restricted_switch_widget.xml index e1f6cdf571011..5dbcb7952e88f 100644 --- a/packages/SettingsLib/res/layout/restricted_switch_widget.xml +++ b/packages/SettingsLib/res/layout/restricted_switch_widget.xml @@ -16,8 +16,8 @@ diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java index f57122e6708d0..1457fcfadc895 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java @@ -58,7 +58,7 @@ public class RestrictedLockUtilsInternal extends RestrictedLockUtils { public static Drawable getRestrictedPadlock(Context context) { Drawable restrictedPadlock = context.getDrawable(android.R.drawable.ic_info); final int iconSize = context.getResources().getDimensionPixelSize( - android.R.dimen.config_restricted_icon_size); + android.R.dimen.config_restrictedIconSize); TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.colorAccent}); int colorAccent = ta.getColor(0, 0); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java index 1091e1601b897..36b70dfe22970 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java @@ -70,17 +70,17 @@ public class HelpUtilsTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - when(mContext.getResources().getString(R.string.config_help_package_name_key)) + when(mContext.getResources().getString(R.string.config_helpPackageNameKey)) .thenReturn(PACKAGE_NAME_KEY); - when(mContext.getResources().getString(R.string.config_help_package_name_value)) + when(mContext.getResources().getString(R.string.config_helpPackageNameValue)) .thenReturn(PACKAGE_NAME_VALUE); - when(mContext.getResources().getString(R.string.config_help_intent_extra_key)) + when(mContext.getResources().getString(R.string.config_helpIntentExtraKey)) .thenReturn(HELP_INTENT_EXTRA_KEY); - when(mContext.getResources().getString(R.string.config_help_intent_name_key)) + when(mContext.getResources().getString(R.string.config_helpIntentNameKey)) .thenReturn(HELP_INTENT_NAME_KEY); - when(mContext.getResources().getString(R.string.config_feedback_intent_extra_key)) + when(mContext.getResources().getString(R.string.config_feedbackIntentExtraKey)) .thenReturn(FEEDBACK_INTENT_EXTRA_KEY); - when(mContext.getResources().getString(R.string.config_feedback_intent_name_key)) + when(mContext.getResources().getString(R.string.config_feedbackIntentNameKey)) .thenReturn(FEEDBACK_INTENT_NAME_KEY); when(mActivity.getPackageManager()).thenReturn(mPackageManager);