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

Commit f5678e91 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Introduce new API version to avoid breakage with the Froyo APIs;... 

Merge "Introduce new API version to avoid breakage with the Froyo APIs; introduce padding in the resources to avoid cross-branch merge pain." into kraken
parents e02ffa34 cd0d10f9

api/9.xml

0 → 100644
+395762 −0

File added.

File size exceeds preview limit.

View file

api/current.xml

+5827 −2351

File changed.

File size exceeds preview limit.

View original file
View changed file

core/res/res/values/public.xml

+16 −0
Original line number Diff line number Diff line
@@ -1239,4 +1239,20 @@ 
    

  <public type="anim" name="cycle_interpolator" id="0x010a000c" />



<!-- ===============================================================

     Resources introduced in kraken.

     =============================================================== -->

     

  <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />

  <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />

  <public-padding type="anim" name="kraken_resource_pad" end="0x010a0020" />

  <public-padding type="drawable" name="kraken_resource_pad" end="0x01080100" />

  <public-padding type="style" name="kraken_resource_pad" end="0x01030090" />

  <public-padding type="string" name="kraken_resource_pad" end="0x01040020" />

  <public-padding type="integer" name="kraken_resource_pad" end="0x010e0010" />

  <public-padding type="layout" name="kraken_resource_pad" end="0x01090020" />

  <public-padding type="dimen" name="kraken_resource_pad" end="0x01050010" />

  <public-padding type="color" name="kraken_resource_pad" end="0x01060020" />

  <public-padding type="array" name="kraken_resource_pad" end="0x01070010" />



</resources>