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

Merge "Revert "Define video-call-app config option"" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-10 20:06:16 +00:00
committed by Android (Google) Code Review
parent 9b6c403009 349d9ac006
commit 444fd9185c
4 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/system-current.txt
View File

@@ -338,9 +338,8 @@ package android {
field public static final int config_helpPackageNameKey = 17039387; // 0x104001b
field public static final int config_helpPackageNameValue = 17039388; // 0x104001c
field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
field public static final int config_systemAutomotiveProjection = 17039402; // 0x104002a
field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
field public static final int config_systemGallery = 17039399; // 0x1040027
field public static final int config_systemVideoCall = 17039401; // 0x1040029
}
public static final class R.style {

3
core/api/test-current.txt
View File

@@ -54,9 +54,8 @@ package android {
field public static final int config_defaultAssistant = 17039393; // 0x1040021
field public static final int config_defaultDialer = 17039395; // 0x1040023
field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
field public static final int config_systemAutomotiveProjection = 17039402; // 0x104002a
field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
field public static final int config_systemGallery = 17039399; // 0x1040027
field public static final int config_systemVideoCall = 17039401; // 0x1040029
}
}

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

@@ -1946,8 +1946,6 @@
<string name="config_systemAutomotiveProjection" translatable="false"></string>
<!-- The name of the package that will hold the system cluster service role. -->
<string name="config_systemAutomotiveCluster" translatable="false"></string>
<!-- The name of the package that will hold the system video call role. -->
<string name="config_systemVideoCall" translatable="false"></string>
<!-- The name of the package that will be allowed to change its components' label/icon. -->
<string name="config_overrideComponentUiPackage" translatable="false"></string>

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

@@ -3118,8 +3118,6 @@
<!-- @hide @SystemApi @TestApi -->
<public name="config_systemAutomotiveCluster" />
<!-- @hide @SystemApi @TestApi -->
<public name="config_systemVideoCall" />
<!-- @hide @SystemApi @TestApi -->
<public name="config_systemAutomotiveProjection" />
</public-group>