diff options
author | Dianne Hackborn <> | 2009-03-27 14:59:22 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 14:59:22 -0700 |
commit | 88fb1069bf254dc68c83546496592a9b5e739a07 (patch) | |
tree | 2333fd9e614ad518822ac1458ae2fb8c90db0ad9 /api | |
parent | 7ec434e2e179776d75c8a4da66dcfd2ee630c5d8 (diff) | |
download | frameworks_base-88fb1069bf254dc68c83546496592a9b5e739a07.zip frameworks_base-88fb1069bf254dc68c83546496592a9b5e739a07.tar.gz frameworks_base-88fb1069bf254dc68c83546496592a9b5e739a07.tar.bz2 |
AI 143147: Manual integration
Automated import of CL 143147
Diffstat (limited to 'api')
-rw-r--r-- | api/current.xml | 222 |
1 files changed, 12 insertions, 210 deletions
diff --git a/api/current.xml b/api/current.xml index 5dd99ed..92826ae 100644 --- a/api/current.xml +++ b/api/current.xml @@ -3181,7 +3181,7 @@ type="int" transient="false" volatile="false" - value="16843377" + value="16843371" static="true" final="true" deprecated="not deprecated" @@ -3841,7 +3841,7 @@ type="int" transient="false" volatile="false" - value="16843367" + value="16843308" static="true" final="true" deprecated="not deprecated" @@ -6708,17 +6708,6 @@ visibility="public" > </field> -<field name="starStyleButtonless" - type="int" - transient="false" - volatile="false" - value="16843308" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="startColor" type="int" transient="false" @@ -7207,7 +7196,7 @@ type="int" transient="false" volatile="false" - value="16843376" + value="16843370" static="true" final="true" deprecated="not deprecated" @@ -8870,7 +8859,7 @@ type="int" transient="false" volatile="false" - value="17301686" + value="17301669" static="true" final="true" deprecated="not deprecated" @@ -8987,193 +8976,6 @@ visibility="public" > </field> -<field name="emo_im_angel" - type="int" - transient="false" - volatile="false" - value="17301668" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_cool" - type="int" - transient="false" - volatile="false" - value="17301669" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_crying" - type="int" - transient="false" - volatile="false" - value="17301670" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_embarrassed" - type="int" - transient="false" - volatile="false" - value="17301671" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_foot_in_mouth" - type="int" - transient="false" - volatile="false" - value="17301672" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_happy" - type="int" - transient="false" - volatile="false" - value="17301673" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_kissing" - type="int" - transient="false" - volatile="false" - value="17301674" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_laughing" - type="int" - transient="false" - volatile="false" - value="17301675" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_lips_are_sealed" - type="int" - transient="false" - volatile="false" - value="17301676" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_money_mouth" - type="int" - transient="false" - volatile="false" - value="17301677" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_sad" - type="int" - transient="false" - volatile="false" - value="17301678" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_surprised" - type="int" - transient="false" - volatile="false" - value="17301679" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_tongue_sticking_out" - type="int" - transient="false" - volatile="false" - value="17301680" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_undecided" - type="int" - transient="false" - volatile="false" - value="17301681" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_winking" - type="int" - transient="false" - volatile="false" - value="17301682" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_wtf" - type="int" - transient="false" - volatile="false" - value="17301683" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="emo_im_yelling" - type="int" - transient="false" - volatile="false" - value="17301684" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="gallery_thumb" type="int" transient="false" @@ -9189,7 +8991,7 @@ type="int" transient="false" volatile="false" - value="17301685" + value="17301668" static="true" final="true" deprecated="not deprecated" @@ -10586,7 +10388,7 @@ type="int" transient="false" volatile="false" - value="17301687" + value="17301670" static="true" final="true" deprecated="not deprecated" @@ -10687,33 +10489,33 @@ visibility="public" > </field> -<field name="button_close" +<field name="candidatesArea" type="int" transient="false" volatile="false" - value="16908327" + value="16908317" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="candidatesArea" +<field name="checkbox" type="int" transient="false" volatile="false" - value="16908317" + value="16908289" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="checkbox" +<field name="closeButton" type="int" transient="false" volatile="false" - value="16908289" + value="16908327" static="true" final="true" deprecated="not deprecated" |