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

Commit 523959f5 authored by David Brown's avatar David Brown Committed by Android Git Automerger
Browse files

am d1af902c: Merge "Deprecate some status bar icons that now come from the...

am d1af902c: Merge "Deprecate some status bar icons that now come from the phone app (and shouldn\'t have been public in the first place.)" into gingerbread

Merge commit 'd1af902c' into gingerbread-plus-aosp

* commit 'd1af902c':
  Deprecate some status bar icons that now come from the phone app (and
parents ceb8465e d1af902c
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -13625,7 +13625,7 @@
 value="17301636"
 static="true"
 final="true"
 deprecated="not deprecated"
 deprecated="deprecated"
 visibility="public"
>
</field>
@@ -13636,7 +13636,7 @@
 value="17301637"
 static="true"
 final="true"
 deprecated="not deprecated"
 deprecated="deprecated"
 visibility="public"
>
</field>
@@ -13647,7 +13647,7 @@
 value="17301638"
 static="true"
 final="true"
 deprecated="not deprecated"
 deprecated="deprecated"
 visibility="public"
>
</field>
@@ -13691,7 +13691,7 @@
 value="17301671"
 static="true"
 final="true"
 deprecated="not deprecated"
 deprecated="deprecated"
 visibility="public"
>
</field>
@@ -13702,7 +13702,7 @@
 value="17301672"
 static="true"
 final="true"
 deprecated="not deprecated"
 deprecated="deprecated"
 visibility="public"
>
</field>
+5 −0
Original line number Diff line number Diff line
@@ -869,8 +869,11 @@
  <public type="drawable" name="stat_sys_download" id="0x01080081" />
  <public type="drawable" name="stat_sys_download_done" id="0x01080082" />
  <public type="drawable" name="stat_sys_headset" id="0x01080083" />
  <!-- @deprecated Replaced by a private asset in the phone app. -->
  <public type="drawable" name="stat_sys_phone_call" id="0x01080084" />
  <!-- @deprecated Replaced by a private asset in the phone app. -->
  <public type="drawable" name="stat_sys_phone_call_forward" id="0x01080085" />
  <!-- @deprecated Replaced by a private asset in the phone app. -->
  <public type="drawable" name="stat_sys_phone_call_on_hold" id="0x01080086" />
  <public type="drawable" name="stat_sys_speakerphone" id="0x01080087" />
  <public type="drawable" name="stat_sys_upload" id="0x01080088" />
@@ -1132,7 +1135,9 @@
  <public type="style" name="Widget.ProgressBar.Large.Inverse" id="0x0103005c" />
  <public type="style" name="Widget.ProgressBar.Small.Inverse" id="0x0103005d" />

  <!-- @deprecated Replaced by a private asset in the phone app. -->
  <public type="drawable" name="stat_sys_vp_phone_call" id="0x010800a7" />
  <!-- @deprecated Replaced by a private asset in the phone app. -->
  <public type="drawable" name="stat_sys_vp_phone_call_on_hold" id="0x010800a8" />

  <public type="anim" name="anticipate_interpolator" id="0x010a0007" />