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

Commit 348606fb authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[WIFI] Remove System APIs overlays added as part of Wi-Fi mainline"

parents d71c0bc3 7a0cb4b6

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ package android { 














  public static final class R.drawable {















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













    field public static final int stat_notify_wifi_in_range = 17301685; // 0x10800b5















  }





























  public static final class R.raw {









@@ -281,9 +280,6 @@ 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 notification_channel_network_alerts = 17039398; // 0x1040026













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













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















  }





























  public static final class R.style {

































core/res/res/values/public.xml



+3
−5




























Original line number
Diff line number
Diff line








@@ -3007,8 +3007,6 @@













    </public-group>































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













      <!-- @hide @SystemApi -->













      <public name="stat_notify_wifi_in_range" />















    </public-group>































    <public-group type="style" first-id="0x010302e5">









@@ -3019,11 +3017,11 @@













    </public-group>































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













      <!-- @hide @SystemApi -->













      <!-- @hide -->















      <public name="notification_channel_network_status" />













      <!-- @hide @SystemApi -->













      <!-- @hide -->















      <public name="notification_channel_network_alerts" />













      <!-- @hide @SystemApi -->













      <!-- @hide -->















      <public name="notification_channel_network_available" />















      <!-- @hide @SystemApi -->















      <public name="config_defaultCallRedirection" />

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -1342,6 +1342,7 @@













  <java-symbol type="drawable" name="picture_emergency" />















  <java-symbol type="drawable" name="platlogo" />















  <java-symbol type="drawable" name="stat_notify_sync_error" />













  <java-symbol type="drawable" name="stat_notify_wifi_in_range" />















  <java-symbol type="drawable" name="ic_wifi_signal_0" />















  <java-symbol type="drawable" name="ic_wifi_signal_1" />















  <java-symbol type="drawable" name="ic_wifi_signal_2" />