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

Commit 69a19fdb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 3d2818d3: Remove public resource padding. 

Merge commit '3d2818d3' into gingerbread-plus-aosp

* commit '3d2818d3':
  Remove public resource padding.
parents c9cff071 3d2818d3

api/current.xml

+1 −3235

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/Build.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public class Build { 
         * graphics to ensure they look okay on a dark background.

         * </ul>

         */

        public static final int GINGERBREAD = CUR_DEVELOPMENT;

        public static final int GINGERBREAD = 9;

    }

    

    /** The type of build, like "user" or "eng". */

core/res/res/values/public.xml

+1 −16
Original line number Diff line number Diff line
@@ -1261,11 +1261,6 @@ 
  <public type="attr" name="textSelectHandleWindowStyle" id="0x010102c8" />

  <public type="attr" name="popupAnimationStyle" id="0x010102c9" />



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



  <!-- presence drawables for videochat or audiochat capable contacts -->

  <public type="drawable" name="presence_video_away" id="0x010800ac" />

  <public type="drawable" name="presence_video_busy" id="0x010800ad" />
@@ -1274,19 +1269,9 @@ 
  <public type="drawable" name="presence_audio_busy" id="0x010800b0" />

  <public type="drawable" name="presence_audio_online" id="0x010800b1" />



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

  

  <public type="style" name="TextAppearance.StatusBar.Title" id="0x01030065" />

  <public type="style" name="TextAppearance.StatusBar.Icon" id="0x01030066" />

  <public type="style" name="TextAppearance.StatusBar.EventContent" id="0x01030067" />

  <public type="style" name="TextAppearance.StatusBar.EventContent.Title" id="0x01030068" />

  

  <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>