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

Commit 87f59365 authored by Yi-an Chen's avatar Yi-an Chen Committed by Automerger Merge Worker
Browse files

Merge "Add PbA branding API" into tm-dev am: 75e09d14 

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

Change-Id: I19f393b9c622ed79e4bb497f9d9ab24cb1dcb64f
parents c011dae9 75e09d14

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ package android { 














  public static final class R.drawable {















    field public static final int ic_info = 17301684; // 0x10800b4













    field public static final int ic_safety_protection;















  }





























  public static final class R.raw {










@@ -449,6 +450,7 @@ package android {













    field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037















    field public static final int config_systemWellbeing = 17039408; // 0x1040030















    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f













    field public static final int safety_protection_display_text;















  }





























  public static final class R.style {

























core/res/res/values/config.xml



+10
−0




























Original line number
Diff line number
Diff line








@@ -5808,4 +5808,14 @@













         because of it.















    -->















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
























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



+4
−0




























Original line number
Diff line number
Diff line








@@ -174,6 +174,8 @@













    <public name="config_systemAutomotiveCalendarSyncManager" />















    <!-- @hide @SystemApi -->















    <public name="config_defaultAutomotiveNavigation" />













    <!-- @hide @SystemApi -->













    <public name="safety_protection_display_text" />















  </staging-public-group>































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









@@ -188,6 +190,8 @@













  </staging-public-group>































  <staging-public-group type="drawable" first-id="0x01d80000">













    <!-- @hide @SystemApi -->













    <public name="ic_safety_protection" />















  </staging-public-group>































  <staging-public-group type="layout" first-id="0x01d70000">