Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PbA branding API" into tm-dev

Browse Source
This commit is contained in:
Yi-an Chen
2022-03-21 18:15:31 +00:00
committed by Android (Google) Code Review
parent 605e24d707 5898e64241
commit 75e09d14c9
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -403,6 +403,7 @@ package android {
public static final class R.drawable { public static final class R.drawable {
field public static final int ic_info = 17301684; // 0x10800b4 field public static final int ic_info = 17301684; // 0x10800b4
field public static final int ic_safety_protection;
} }
public static final class R.raw { public static final class R.raw {
@@ -448,6 +449,7 @@ package android {
field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037 field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037
field public static final int config_systemWellbeing = 17039408; // 0x1040030 field public static final int config_systemWellbeing = 17039408; // 0x1040030
field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f
field public static final int safety_protection_display_text;
} }
public static final class R.style { public static final class R.style {

10
core/res/res/values/config.xml
View File

@@ -5808,4 +5808,14 @@
because of it. because of it.
--> -->
<bool name="config_bg_current_drain_high_threshold_by_bg_location">false</bool> <bool name="config_bg_current_drain_high_threshold_by_bg_location">false</bool>
<!-- Start safety protection resources to be overlaid -->
<!-- Safety protection icon to be overlaid -->
<item name="ic_safety_protection" type="drawable">@null</item>
<!-- Display text for safety protection to be overlaid. This is translatable -->
<string name="safety_protection_display_text"></string>
<!-- End safety protection resources to be overlaid -->
</resources> </resources>

4
core/res/res/values/public-staging.xml
View File

@@ -174,6 +174,8 @@
<public name="config_systemAutomotiveCalendarSyncManager" /> <public name="config_systemAutomotiveCalendarSyncManager" />
<!-- @hide @SystemApi --> <!-- @hide @SystemApi -->
<public name="config_defaultAutomotiveNavigation" /> <public name="config_defaultAutomotiveNavigation" />
<!-- @hide @SystemApi -->
<public name="safety_protection_display_text" />
</staging-public-group> </staging-public-group>
<staging-public-group type="dimen" first-id="0x01db0000"> <staging-public-group type="dimen" first-id="0x01db0000">
@@ -188,6 +190,8 @@
</staging-public-group> </staging-public-group>
<staging-public-group type="drawable" first-id="0x01d80000"> <staging-public-group type="drawable" first-id="0x01d80000">
<!-- @hide @SystemApi -->
<public name="ic_safety_protection" />
</staging-public-group> </staging-public-group>
<staging-public-group type="layout" first-id="0x01d70000"> <staging-public-group type="layout" first-id="0x01d70000">