Merge "rename config_settingsIntelligencePackageName" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
47ca24da97
@@ -439,6 +439,7 @@ package android {
|
|||||||
field public static final int config_systemContacts = 17039403; // 0x104002b
|
field public static final int config_systemContacts = 17039403; // 0x104002b
|
||||||
field public static final int config_systemGallery = 17039399; // 0x1040027
|
field public static final int config_systemGallery = 17039399; // 0x1040027
|
||||||
field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035
|
field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035
|
||||||
|
field public static final int config_systemSettingsIntelligence;
|
||||||
field public static final int config_systemShell = 17039402; // 0x104002a
|
field public static final int config_systemShell = 17039402; // 0x104002a
|
||||||
field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e
|
field public static final int config_systemSpeechRecognizer = 17039406; // 0x104002e
|
||||||
field public static final int config_systemSupervision;
|
field public static final int config_systemSupervision;
|
||||||
|
|||||||
@@ -2931,8 +2931,8 @@
|
|||||||
<!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
|
<!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
|
||||||
<string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>
|
<string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>
|
||||||
|
|
||||||
<!-- Settings intelligence package name -->
|
<!-- System settings intelligence package name -->
|
||||||
<string name="config_settingsIntelligencePackageName" translatable="false">
|
<string name="config_systemSettingsIntelligence" translatable="false">
|
||||||
com.android.settings.intelligence
|
com.android.settings.intelligence
|
||||||
</string>
|
</string>
|
||||||
|
|
||||||
|
|||||||
@@ -176,6 +176,8 @@
|
|||||||
<public name="config_defaultAutomotiveNavigation" />
|
<public name="config_defaultAutomotiveNavigation" />
|
||||||
<!-- @hide @SystemApi -->
|
<!-- @hide @SystemApi -->
|
||||||
<public name="safety_protection_display_text" />
|
<public name="safety_protection_display_text" />
|
||||||
|
<!-- @hide @SystemApi -->
|
||||||
|
<public name="config_systemSettingsIntelligence" />
|
||||||
</staging-public-group>
|
</staging-public-group>
|
||||||
|
|
||||||
<staging-public-group type="dimen" first-id="0x01db0000">
|
<staging-public-group type="dimen" first-id="0x01db0000">
|
||||||
|
|||||||
Reference in New Issue
Block a user