diff options
| -rw-r--r-- | api/current.xml | 2955 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 62 | ||||
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 121 |
3 files changed, 3105 insertions, 33 deletions
diff --git a/api/current.xml b/api/current.xml index 9950ba0b6be9..8768786ebf11 100644 --- a/api/current.xml +++ b/api/current.xml @@ -1420,7 +1420,7 @@ type="int" transient="false" volatile="false" - value="17432583" + value="17432609" static="true" final="true" deprecated="not deprecated" @@ -1431,7 +1431,7 @@ type="int" transient="false" volatile="false" - value="17432585" + value="17432611" static="true" final="true" deprecated="not deprecated" @@ -1442,7 +1442,7 @@ type="int" transient="false" volatile="false" - value="17432586" + value="17432612" static="true" final="true" deprecated="not deprecated" @@ -1460,6 +1460,292 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17432608" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17432599" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17432598" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17432597" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17432596" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="17432595" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="17432594" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="17432593" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="17432592" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="17432591" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="17432590" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17432607" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="17432589" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="17432588" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="17432587" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad23" + type="int" + transient="false" + volatile="false" + value="17432586" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad24" + type="int" + transient="false" + volatile="false" + value="17432585" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad25" + type="int" + transient="false" + volatile="false" + value="17432584" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad26" + type="int" + transient="false" + volatile="false" + value="17432583" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17432606" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17432605" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17432604" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17432603" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17432602" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17432601" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17432600" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="fade_in" type="int" transient="false" @@ -1486,7 +1772,7 @@ type="int" transient="false" volatile="false" - value="17432587" + value="17432613" static="true" final="true" deprecated="not deprecated" @@ -1497,7 +1783,7 @@ type="int" transient="false" volatile="false" - value="17432584" + value="17432610" static="true" final="true" deprecated="not deprecated" @@ -1543,6 +1829,138 @@ visibility="public" > </constructor> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17235984" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17235975" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17235974" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17235973" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17235983" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17235982" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17235981" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17235980" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17235979" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17235978" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17235977" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17235976" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="emailAddressTypes" type="int" transient="false" @@ -1630,7 +2048,7 @@ type="int" transient="false" volatile="false" - value="16843380" + value="16843433" static="true" final="true" deprecated="not deprecated" @@ -2587,7 +3005,7 @@ type="int" transient="false" volatile="false" - value="16843381" + value="16843434" static="true" final="true" deprecated="not deprecated" @@ -2902,6 +3320,490 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="16843423" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="16843414" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="16843413" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="16843412" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="16843411" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="16843410" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="16843409" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="16843408" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="16843407" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="16843406" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="16843405" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="16843422" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="16843404" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="16843403" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="16843402" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad23" + type="int" + transient="false" + volatile="false" + value="16843401" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad24" + type="int" + transient="false" + volatile="false" + value="16843400" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad25" + type="int" + transient="false" + volatile="false" + value="16843399" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad26" + type="int" + transient="false" + volatile="false" + value="16843398" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad27" + type="int" + transient="false" + volatile="false" + value="16843397" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad28" + type="int" + transient="false" + volatile="false" + value="16843396" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad29" + type="int" + transient="false" + volatile="false" + value="16843395" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="16843421" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad30" + type="int" + transient="false" + volatile="false" + value="16843394" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad31" + type="int" + transient="false" + volatile="false" + value="16843393" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad32" + type="int" + transient="false" + volatile="false" + value="16843392" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad33" + type="int" + transient="false" + volatile="false" + value="16843391" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad34" + type="int" + transient="false" + volatile="false" + value="16843390" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad35" + type="int" + transient="false" + volatile="false" + value="16843389" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad36" + type="int" + transient="false" + volatile="false" + value="16843388" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad37" + type="int" + transient="false" + volatile="false" + value="16843387" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad38" + type="int" + transient="false" + volatile="false" + value="16843386" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad39" + type="int" + transient="false" + volatile="false" + value="16843385" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="16843420" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad40" + type="int" + transient="false" + volatile="false" + value="16843384" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad41" + type="int" + transient="false" + volatile="false" + value="16843383" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad42" + type="int" + transient="false" + volatile="false" + value="16843382" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad43" + type="int" + transient="false" + volatile="false" + value="16843381" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad44" + type="int" + transient="false" + volatile="false" + value="16843380" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="16843419" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="16843418" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="16843417" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="16843416" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="16843415" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="drawSelectorOnTop" type="int" transient="false" @@ -8612,6 +9514,347 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17170480" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17170471" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17170470" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17170469" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17170468" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="17170467" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="17170466" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="17170465" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="17170464" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="17170463" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="17170462" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17170479" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="17170461" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="17170460" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="17170459" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad23" + type="int" + transient="false" + volatile="false" + value="17170458" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad24" + type="int" + transient="false" + volatile="false" + value="17170457" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad25" + type="int" + transient="false" + volatile="false" + value="17170456" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad26" + type="int" + transient="false" + volatile="false" + value="17170455" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad27" + type="int" + transient="false" + volatile="false" + value="17170454" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad28" + type="int" + transient="false" + volatile="false" + value="17170453" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad29" + type="int" + transient="false" + volatile="false" + value="17170452" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17170478" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad30" + type="int" + transient="false" + volatile="false" + value="17170451" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad31" + type="int" + transient="false" + volatile="false" + value="17170450" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17170477" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17170476" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17170475" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17170474" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17170473" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17170472" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="primary_text_dark" type="int" transient="false" @@ -8794,6 +10037,160 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17104912" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17104903" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17104902" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17104901" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17104900" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="17104899" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17104911" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17104910" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17104909" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17104908" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17104907" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17104906" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17104905" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17104904" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="thumbnail_height" type="int" transient="false" @@ -9108,6 +10505,468 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17301712" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17301703" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17301702" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17301701" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17301700" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="17301699" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="17301698" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="17301697" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="17301696" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="17301695" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="17301694" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17301711" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="17301693" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="17301692" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="17301691" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad23" + type="int" + transient="false" + volatile="false" + value="17301690" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad24" + type="int" + transient="false" + volatile="false" + value="17301689" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad25" + type="int" + transient="false" + volatile="false" + value="17301688" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad26" + type="int" + transient="false" + volatile="false" + value="17301687" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad27" + type="int" + transient="false" + volatile="false" + value="17301686" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad28" + type="int" + transient="false" + volatile="false" + value="17301685" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad29" + type="int" + transient="false" + volatile="false" + value="17301684" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17301710" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad30" + type="int" + transient="false" + volatile="false" + value="17301683" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad31" + type="int" + transient="false" + volatile="false" + value="17301682" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad32" + type="int" + transient="false" + volatile="false" + value="17301681" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad33" + type="int" + transient="false" + volatile="false" + value="17301680" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad34" + type="int" + transient="false" + volatile="false" + value="17301679" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad35" + type="int" + transient="false" + volatile="false" + value="17301678" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad36" + type="int" + transient="false" + volatile="false" + value="17301677" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad37" + type="int" + transient="false" + volatile="false" + value="17301676" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad38" + type="int" + transient="false" + volatile="false" + value="17301675" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad39" + type="int" + transient="false" + volatile="false" + value="17301674" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17301709" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad40" + type="int" + transient="false" + volatile="false" + value="17301673" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad41" + type="int" + transient="false" + volatile="false" + value="17301672" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad42" + type="int" + transient="false" + volatile="false" + value="17301671" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17301708" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17301707" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17301706" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17301705" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17301704" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="edit_text" type="int" transient="false" @@ -10443,7 +12302,7 @@ type="int" transient="false" volatile="false" - value="17302061" + value="17301713" static="true" final="true" deprecated="not deprecated" @@ -10454,7 +12313,7 @@ type="int" transient="false" volatile="false" - value="17302062" + value="17301714" static="true" final="true" deprecated="not deprecated" @@ -10775,6 +12634,248 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="16908352" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="16908343" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="16908342" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="16908341" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="16908340" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="16908339" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="16908338" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="16908337" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="16908336" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="16908335" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="16908334" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="16908351" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="16908333" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="16908332" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="16908331" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="16908350" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="16908349" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="16908348" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="16908347" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="16908346" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="16908345" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="16908344" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="edit" type="int" transient="false" @@ -11166,6 +13267,160 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17694736" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17694727" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17694726" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17694725" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17694724" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="17694723" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17694735" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17694734" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17694733" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17694732" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17694731" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17694730" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17694729" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17694728" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="R.layout" extends="java.lang.Object" @@ -11205,6 +13460,149 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17367072" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17367063" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17367062" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17367061" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17367060" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17367071" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17367070" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17367069" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17367068" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17367067" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17367066" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17367065" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17367064" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="expandable_list_content" type="int" transient="false" @@ -11575,6 +13973,303 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="17039408" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="17039399" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="17039398" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="17039397" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="17039396" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="17039395" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="17039394" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="17039393" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="17039392" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="17039391" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="17039390" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="17039407" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="17039389" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="17039388" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="17039387" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad23" + type="int" + transient="false" + volatile="false" + value="17039386" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad24" + type="int" + transient="false" + volatile="false" + value="17039385" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad25" + type="int" + transient="false" + volatile="false" + value="17039384" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad26" + type="int" + transient="false" + volatile="false" + value="17039383" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad27" + type="int" + transient="false" + volatile="false" + value="17039382" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="17039406" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="17039405" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="17039404" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="17039403" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="17039402" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="17039401" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="17039400" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="emptyPhoneNumber" type="int" transient="false" @@ -12692,6 +15387,248 @@ visibility="public" > </field> +<field name="donut_resource_pad1" + type="int" + transient="false" + volatile="false" + value="16973936" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad10" + type="int" + transient="false" + volatile="false" + value="16973927" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad11" + type="int" + transient="false" + volatile="false" + value="16973926" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad12" + type="int" + transient="false" + volatile="false" + value="16973925" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad13" + type="int" + transient="false" + volatile="false" + value="16973924" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad14" + type="int" + transient="false" + volatile="false" + value="16973923" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad15" + type="int" + transient="false" + volatile="false" + value="16973922" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad16" + type="int" + transient="false" + volatile="false" + value="16973921" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad17" + type="int" + transient="false" + volatile="false" + value="16973920" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad18" + type="int" + transient="false" + volatile="false" + value="16973919" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad19" + type="int" + transient="false" + volatile="false" + value="16973918" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad2" + type="int" + transient="false" + volatile="false" + value="16973935" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad20" + type="int" + transient="false" + volatile="false" + value="16973917" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad21" + type="int" + transient="false" + volatile="false" + value="16973916" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad22" + type="int" + transient="false" + volatile="false" + value="16973915" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad3" + type="int" + transient="false" + volatile="false" + value="16973934" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad4" + type="int" + transient="false" + volatile="false" + value="16973933" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad5" + type="int" + transient="false" + volatile="false" + value="16973932" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad6" + type="int" + transient="false" + volatile="false" + value="16973931" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad7" + type="int" + transient="false" + volatile="false" + value="16973930" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad8" + type="int" + transient="false" + volatile="false" + value="16973929" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="donut_resource_pad9" + type="int" + transient="false" + volatile="false" + value="16973928" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="R.xml" extends="java.lang.Object" diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 027e0ad0ed9d..5eec44843485 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1091,31 +1091,55 @@ =============================================================== --> <eat-comment /> - <public type="attr" name="tension" id="0x0101026a" /> - <public type="attr" name="extraTension" id="0x0101026b" /> - <public type="attr" name="density" id="0x0101026c" /> - <public type="attr" name="searchSuggestThreshold" id="0x0101026d" /> - <public type="attr" name="includeInGlobalSearch" id="0x0101026e" /> - <public type="attr" name="onClick" id="0x0101026f" /> - <public type="attr" name="targetSdkVersion" id="0x01010270" /> - <public type="attr" name="maxSdkVersion" id="0x01010271" /> - <public type="attr" name="testOnly" id="0x01010272" /> - <public type="attr" name="contentDescription" id="0x01010273" /> + <public type="attr" name="tension" id="0x0101026a" /> + <public type="attr" name="extraTension" /> + <public type="attr" name="density" /> + <public type="attr" name="searchSuggestThreshold" /> + <public type="attr" name="includeInGlobalSearch" /> + <public type="attr" name="onClick" /> + <public type="attr" name="targetSdkVersion" /> + <public type="attr" name="maxSdkVersion" /> + <public type="attr" name="testOnly" /> + <public type="attr" name="contentDescription" /> + + <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" /> - <public type="anim" name="anticipate_interpolator" id="0x010a0007" /> - <public type="anim" name="overshoot_interpolator" id="0x010a0008" /> - <public type="anim" name="anticipate_overshoot_interpolator" id="0x010a0009" /> - <public type="anim" name="bounce_interpolator" id="0x010a000a" /> - <public type="anim" name="linear_interpolator" id="0x010a000b" /> + <public-padding type="id" name="donut_resource_pad" end="0x01020040" /> + + <public-padding type="style" name="donut_resource_pad" end="0x01030070" /> + + <public-padding type="string" name="donut_resource_pad" end="0x01040030" /> - <public type="drawable" name="stat_sys_vp_phone_call" id="0x0108022d" /> - <public type="drawable" name="stat_sys_vp_phone_call_on_hold" id="0x0108022e" /> + <public-padding type="dimen" name="donut_resource_pad" end="0x01050010" /> + <public-padding type="color" name="donut_resource_pad" end="0x01060030" /> + + <public-padding type="array" name="donut_resource_pad" end="0x01070010" /> + + <public-padding type="anim" name="donut_resource_pad" end="0x010a0020" /> + + <public-padding type="integer" name="donut_resource_pad" end="0x010e0010" /> + + <public type="anim" name="anticipate_interpolator" /> + <public type="anim" name="overshoot_interpolator" /> + <public type="anim" name="anticipate_overshoot_interpolator" /> + <public type="anim" name="bounce_interpolator" /> + <public type="anim" name="linear_interpolator" /> + + <public-padding type="drawable" name="donut_resource_pad" end="0x010800d0" /> + + <public-padding type="layout" name="donut_resource_pad" end="0x01090020" /> + + <!-- =============================================================== Resources added in version 5 of the platform. =============================================================== --> <eat-comment /> - <public type="attr" name="accountType" id="0x01010274" /> - <public type="attr" name="contentAuthority" id="0x01010275" /> + <public type="attr" name="accountType" id="0x010102A9" /> + <public type="attr" name="contentAuthority" id="0x010102AA" /> + <public type="drawable" name="stat_sys_vp_phone_call" /> + <public type="drawable" name="stat_sys_vp_phone_call_on_hold" /> + + </resources> diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index 25ab1474d948..66607a33d1f9 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -661,6 +661,7 @@ status_t compileResourceFile(Bundle* bundle, const String16 string_array16("string-array"); const String16 integer_array16("integer-array"); const String16 public16("public"); + const String16 public_padding16("public-padding"); const String16 private_symbols16("private-symbols"); const String16 skip16("skip"); const String16 eat_comment16("eat-comment"); @@ -695,7 +696,7 @@ status_t compileResourceFile(Bundle* bundle, bool hasErrors = false; - uint32_t nextPublicId = 0; + DefaultKeyedVector<String16, uint32_t> nextPublicId(0); ResXMLTree::event_code_t code; do { @@ -784,15 +785,15 @@ status_t compileResourceFile(Bundle* bundle, hasErrors = localHasErrors = true; } else { ident = identValue.data; - nextPublicId = ident+1; + nextPublicId.replaceValueFor(type, ident+1); } - } else if (nextPublicId == 0) { + } else if (nextPublicId.indexOfKey(type) < 0) { srcPos.error("No 'id' attribute supplied <public>," " and no previous id defined in this file.\n"); hasErrors = localHasErrors = true; } else if (!localHasErrors) { - ident = nextPublicId; - nextPublicId++; + ident = nextPublicId.valueFor(type); + nextPublicId.replaceValueFor(type, ident+1); } if (!localHasErrors) { @@ -826,6 +827,116 @@ status_t compileResourceFile(Bundle* bundle, } continue; + } else if (strcmp16(block.getElementName(&len), public_padding16.string()) == 0) { + SourcePos srcPos(in->getPrintableSource(), block.getLineNumber()); + + String16 type; + ssize_t typeIdx = block.indexOfAttribute(NULL, "type"); + if (typeIdx < 0) { + srcPos.error("A 'type' attribute is required for <public-padding>\n"); + hasErrors = localHasErrors = true; + } + type = String16(block.getAttributeStringValue(typeIdx, &len)); + + String16 name; + ssize_t nameIdx = block.indexOfAttribute(NULL, "name"); + if (nameIdx < 0) { + srcPos.error("A 'name' attribute is required for <public-padding>\n"); + hasErrors = localHasErrors = true; + } + name = String16(block.getAttributeStringValue(nameIdx, &len)); + + uint32_t start = 0; + ssize_t startIdx = block.indexOfAttribute(NULL, "start"); + if (startIdx >= 0) { + const char16_t* startStr = block.getAttributeStringValue(startIdx, &len); + Res_value startValue; + if (!ResTable::stringToInt(startStr, len, &startValue)) { + srcPos.error("Given 'start' attribute is not an integer: %s\n", + String8(block.getAttributeStringValue(startIdx, &len)).string()); + hasErrors = localHasErrors = true; + } else { + start = startValue.data; + } + } else if (nextPublicId.indexOfKey(type) < 0) { + srcPos.error("No 'start' attribute supplied <public-padding>," + " and no previous id defined in this file.\n"); + hasErrors = localHasErrors = true; + } else if (!localHasErrors) { + start = nextPublicId.valueFor(type); + } + + uint32_t end = 0; + ssize_t endIdx = block.indexOfAttribute(NULL, "end"); + if (endIdx >= 0) { + const char16_t* endStr = block.getAttributeStringValue(endIdx, &len); + Res_value endValue; + if (!ResTable::stringToInt(endStr, len, &endValue)) { + srcPos.error("Given 'end' attribute is not an integer: %s\n", + String8(block.getAttributeStringValue(endIdx, &len)).string()); + hasErrors = localHasErrors = true; + } else { + end = endValue.data; + } + } else { + srcPos.error("No 'end' attribute supplied <public-padding>\n"); + hasErrors = localHasErrors = true; + } + + if (end >= start) { + nextPublicId.replaceValueFor(type, end+1); + } else { + srcPos.error("Padding start '%ul' is after end '%ul'\n", + start, end); + hasErrors = localHasErrors = true; + } + + String16 comment( + block.getComment(&len) ? block.getComment(&len) : nulStr); + for (uint32_t curIdent=start; curIdent<=end; curIdent++) { + if (localHasErrors) { + break; + } + String16 curName(name); + char buf[64]; + sprintf(buf, "%d", (int)(end-curIdent+1)); + curName.append(String16(buf)); + + err = outTable->addEntry(srcPos, myPackage, type, curName, + String16("padding"), NULL, &curParams, false, + ResTable_map::TYPE_STRING, overwrite); + if (err < NO_ERROR) { + hasErrors = localHasErrors = true; + break; + } + err = outTable->addPublic(srcPos, myPackage, type, + curName, curIdent); + if (err < NO_ERROR) { + hasErrors = localHasErrors = true; + break; + } + sp<AaptSymbols> symbols = assets->getSymbolsFor(String8("R")); + if (symbols != NULL) { + symbols = symbols->addNestedSymbol(String8(type), srcPos); + } + if (symbols != NULL) { + symbols->makeSymbolPublic(String8(curName), srcPos); + symbols->appendComment(String8(curName), comment, srcPos); + } else { + srcPos.error("Unable to create symbols!\n"); + hasErrors = localHasErrors = true; + } + } + + while ((code=block.next()) != ResXMLTree::END_DOCUMENT && code != ResXMLTree::BAD_DOCUMENT) { + if (code == ResXMLTree::END_TAG) { + if (strcmp16(block.getElementName(&len), public_padding16.string()) == 0) { + break; + } + } + } + continue; + } else if (strcmp16(block.getElementName(&len), private_symbols16.string()) == 0) { String16 pkg; ssize_t pkgIdx = block.indexOfAttribute(NULL, "package"); |