am 523959f5: 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 '523959f50e56d8c888f39e19855ffdc8d0c2b6fc'

* commit '523959f50e56d8c888f39e19855ffdc8d0c2b6fc':
  Deprecate some status bar icons that now come from the phone app (and
This commit is contained in:
David Brown
2010-07-12 13:35:49 -07:00
committed by Android Git Automerger
2 changed files with 10 additions and 5 deletions

View File

@@ -13955,7 +13955,7 @@
value="17301636"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -13966,7 +13966,7 @@
value="17301637"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -13977,7 +13977,7 @@
value="17301638"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -14021,7 +14021,7 @@
value="17301671"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>
@@ -14032,7 +14032,7 @@
value="17301672"
static="true"
final="true"
deprecated="not deprecated"
deprecated="deprecated"
visibility="public"
>
</field>

View File

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