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

Commit 7d3c37de authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Android (Google) Code Review
Browse files

Merge "Add the NOTES role related configs in xml under core for OEMs to manage."

parents 48465344 2f840879

core/api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -393,6 +393,8 @@ package android { 
  }















  public static final class R.bool {













    field public static final int config_enableDefaultNotes;













    field public static final int config_enableDefaultNotesForWorkProfile;















    field public static final int config_enableQrCodeScannerOnLockScreen = 17891336; // 0x1110008















    field public static final int config_safetyProtectionEnabled;















    field public static final int config_sendPackageName = 17891328; // 0x1110000










@@ -429,6 +431,7 @@ package android {













    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025















    field public static final int config_defaultCallScreening = 17039398; // 0x1040026















    field public static final int config_defaultDialer = 17039395; // 0x1040023













    field public static final int config_defaultNotes;















    field public static final int config_defaultSms = 17039396; // 0x1040024















    field public static final int config_devicePolicyManagement = 17039421; // 0x104003d















    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f

























core/res/res/values/config.xml



+6
−0




























Original line number
Diff line number
Diff line








@@ -2135,6 +2135,12 @@













    <string name="config_defaultAutomotiveNavigation" translatable="false"></string>















    <!-- The name of the package that will hold the system wear health service role. -->















    <string name="config_systemWearHealthService" translatable="false"></string>













    <!-- The name of the package that will hold the default notes role. -->













    <string name="config_defaultNotes" translatable="false"></string>













    <!-- Whether the default notes role should be enabled. -->













    <bool name="config_enableDefaultNotes">false</bool>













    <!-- Whether the default notes role for work profile should be enabled. -->













    <bool name="config_enableDefaultNotesForWorkProfile">false</bool>































    <!-- The name of the package that will handle updating the device management role. -->















    <string name="config_devicePolicyManagementUpdater" translatable="false"></string>

































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



+6
−0




























Original line number
Diff line number
Diff line








@@ -139,6 +139,8 @@













  <staging-public-group type="string" first-id="0x01cb0000">















    <!-- @hide @SystemApi -->















    <public name="config_systemWearHealthService" />













    <!-- @hide @SystemApi -->













    <public name="config_defaultNotes" />















  </staging-public-group>































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










@@ -182,6 +184,10 @@













  <staging-public-group type="bool" first-id="0x01be0000">















    <!-- @hide @SystemApi -->















    <public name="config_safetyProtectionEnabled" />













    <!-- @hide @SystemApi -->













    <public name="config_enableDefaultNotes" />













    <!-- @hide @SystemApi -->













    <public name="config_enableDefaultNotesForWorkProfile" />















  </staging-public-group>































  <staging-public-group type="fraction" first-id="0x01bd0000">