diff options
| author | 2010-07-12 13:30:58 -0700 | |
|---|---|---|
| committer | 2010-07-12 13:30:58 -0700 | |
| commit | d1af902c21b4911b964c82ced3d80fcf9ab41540 (patch) | |
| tree | 86ecfe5f15735e198fbc37822c588cde1e042188 | |
| parent | 87bb18579a5eea2e24af78af8c0f54f5455ce8fd (diff) | |
| parent | 26c679751d80e7f1f3de35324666c8eda7db5da2 (diff) | |
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
| -rw-r--r-- | api/current.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/api/current.xml b/api/current.xml index 7a86d050eab8..e66b2e7a60b9 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6c13da6cf9e5..bd65fee45332 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> |