Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename recently added symbols to camel-case"

Browse Source
This commit is contained in:
Philip P. Moltmann
2018-10-15 17:16:55 +00:00
committed by Android (Google) Code Review
parent 4ed4874429 9c7f51e676
commit 125f042c05
9 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/system-current.txt
View File

@@ -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 {

14
core/res/res/values/config.xml
View File

@@ -3367,22 +3367,22 @@
<bool name="config_sendPackageName">false</bool>
<!-- 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 -->
<string name="config_help_package_name_value" translatable="false"></string>
<string name="config_helpPackageNameValue" translatable="false"></string>
<!-- 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 -->
<string name="config_help_intent_name_key" translatable="false"></string>
<string name="config_helpIntentNameKey" translatable="false"></string>
<!-- 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 -->
<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 -->
<string-array name="config_hideWhenDisabled_packageNames"></string-array>
@@ -3487,7 +3487,7 @@
<string name="config_headlineFontFamilyMedium">@string/font_family_button_material</string>
<!-- 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>

14
core/res/res/values/public.xml
View File

@@ -2930,17 +2930,17 @@
<public-group type="string" first-id="0x0104001b">
<!-- @hide @SystemApi -->
<public name="config_help_package_name_key" />
<public name="config_helpPackageNameKey" />
<!-- @hide @SystemApi -->
<public name="config_help_package_name_value" />
<public name="config_helpPackageNameValue" />
<!-- @hide @SystemApi -->
<public name="config_help_intent_extra_key" />
<public name="config_helpIntentExtraKey" />
<!-- @hide @SystemApi -->
<public name="config_help_intent_name_key" />
<public name="config_helpIntentNameKey" />
<!-- @hide @SystemApi -->
<public name="config_feedback_intent_extra_key" />
<public name="config_feedbackIntentExtraKey" />
<!-- @hide @SystemApi -->
<public name="config_feedback_intent_name_key" />
<public name="config_feedbackIntentNameKey" />
</public-group>
<public-group type="bool" first-id="0x01110000">
@@ -2950,7 +2950,7 @@
<public-group type="dimen" first-id="0x01050007">
<!-- @hide @SystemApi -->
<public name="config_restricted_icon_size" />
<public name="config_restrictedIconSize" />
</public-group>
<!-- ===============================================================

12
core/res/res/values/symbols.xml
View File

@@ -3270,12 +3270,12 @@
<java-symbol type="integer" name="default_data_warning_level_mb" />
<java-symbol type="bool" name="config_useVideoPauseWorkaround" />
<java-symbol type="bool" name="config_sendPackageName" />
<java-symbol type="string" name="config_help_package_name_key" />
<java-symbol type="string" name="config_help_package_name_value" />
<java-symbol type="string" name="config_help_intent_extra_key" />
<java-symbol type="string" name="config_help_intent_name_key" />
<java-symbol type="string" name="config_feedback_intent_extra_key" />
<java-symbol type="string" name="config_feedback_intent_name_key" />
<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" />

12
packages/SettingsLib/HelpUtils/src/com/android/settingslib/HelpUtils.java
View File

@@ -187,17 +187,17 @@ public class HelpUtils {
if (sendPackageName && includePackageName) {
String[] packageNameKey =
{resources.getString(android.R.string.config_help_package_name_key)};
{resources.getString(android.R.string.config_helpPackageNameKey)};
String[] packageNameValue =
{resources.getString(android.R.string.config_help_package_name_value)};
{resources.getString(android.R.string.config_helpPackageNameValue)};
String helpIntentExtraKey =
resources.getString(android.R.string.config_help_intent_extra_key);
resources.getString(android.R.string.config_helpIntentExtraKey);
String helpIntentNameKey =
resources.getString(android.R.string.config_help_intent_name_key);
resources.getString(android.R.string.config_helpIntentNameKey);
String feedbackIntentExtraKey =
resources.getString(android.R.string.config_feedback_intent_extra_key);
resources.getString(android.R.string.config_feedbackIntentExtraKey);
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(helpIntentNameKey, packageNameValue);
intent.putExtra(feedbackIntentExtraKey, packageNameKey);

4
packages/SettingsLib/RestrictedLockUtils/res/layout/restricted_icon.xml
View File

@@ -15,7 +15,7 @@
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/restricted_icon"
android:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="@*android:dimen/config_restricted_icon_size"
android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="@*android:dimen/config_restrictedIconSize"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info" />

4
packages/SettingsLib/res/layout/restricted_switch_widget.xml
View File

@@ -16,8 +16,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/restricted_icon"
android:layout_width="@*android:dimen/config_restricted_icon_size"
android:layout_height="@*android:dimen/config_restricted_icon_size"
android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="@*android:dimen/config_restrictedIconSize"
android:tint="?android:attr/colorAccent"
android:src="@*android:drawable/ic_info"
android:gravity="end|center_vertical" />

2
packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtilsInternal.java
View File

@@ -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);

12
packages/SettingsLib/tests/robotests/src/com/android/settingslib/HelpUtilsTest.java
View File

@@ -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);