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

Commit 57e722ad authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Define video-call-app config option"

parents 31d12630 05830b85

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ package android { 
    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c

    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028

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

    field public static final int config_systemVideoCall = 17039401; // 0x1040029

  }















  public static final class R.style {

































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -45,6 +45,7 @@ package android {













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















    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028















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













    field public static final int config_systemVideoCall = 17039401; // 0x1040029















  }































}

































core/res/res/values/config.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -1831,6 +1831,8 @@













    <string name="config_systemGallery" translatable="false">com.android.gallery3d</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>

































core/res/res/values/public.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -3071,6 +3071,8 @@













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















    <!-- @hide @SystemApi @TestApi -->















    <public name="config_systemAutomotiveCluster" />













    <!-- @hide @SystemApi @TestApi -->













    <public name="config_systemVideoCall" />















  </public-group>































  <public-group type="id" first-id="0x01020055">

































non-updatable-api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -307,6 +307,7 @@ package android {













    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c















    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028















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













    field public static final int config_systemVideoCall = 17039401; // 0x1040029















  }





























  public static final class R.style {