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

Commit 0de9d934 authored by Anthony Hugh's avatar Anthony Hugh Committed by Android (Google) Code Review
Browse files

Merge "Add role for Cluster Service in Automotive"

parents ba9004eb 2727ee75

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ package android { 
    field public static final int config_helpIntentNameKey = 17039390; // 0x104001e

    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_systemGallery = 17039399; // 0x1040027

  }

































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








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













  public static final class R.string {















    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_systemGallery = 17039399; // 0x1040027















  }

















































core/res/res/values/config.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -1823,6 +1823,8 @@













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















    <!-- The name of the package that will hold the system gallery role. -->















    <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 be allowed to change its components' label/icon. -->















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

































core/res/res/values/public.xml



+2
−1




























Original line number
Diff line number
Diff line








@@ -3069,7 +3069,8 @@













  </public-group>































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













    <!-- string definitions go here -->













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













    <public name="config_systemAutomotiveCluster" />















  </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








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













    field public static final int config_helpIntentNameKey = 17039390; // 0x104001e















    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_systemGallery = 17039399; // 0x1040027















  }