Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88d4ce3b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "rename config_settingsIntelligencePackageName" into tm-dev am: 47ca24da 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17209585

Change-Id: I78cca67382fe6f783d19bbb058c5749d91e6838c
parents 67c8ceb0 47ca24da

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ package android { 
    field public static final int config_systemContacts = 17039403; // 0x104002b

    field public static final int config_systemGallery = 17039399; // 0x1040027

    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_systemSpeechRecognizer = 17039406; // 0x104002e

    field public static final int config_systemSupervision;

core/res/res/values/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -2931,8 +2931,8 @@ 
    <!-- Apps that are authorized to access shared accounts, overridden by product overlays -->

    <string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>



    <!-- Settings intelligence package name -->

    <string name="config_settingsIntelligencePackageName" translatable="false">

    <!-- System settings intelligence package name -->

    <string name="config_systemSettingsIntelligence" translatable="false">

        com.android.settings.intelligence

    </string>

core/res/res/values/public-staging.xml

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ 
    <public name="config_defaultAutomotiveNavigation" />

    <!-- @hide @SystemApi -->

    <public name="safety_protection_display_text" />

    <!-- @hide @SystemApi -->

    <public name="config_systemSettingsIntelligence" />

  </staging-public-group>



  <staging-public-group type="dimen" first-id="0x01db0000">