Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread

Author: Xavier Ducrohet

tools/layoutlib/bridge/resources/bars/action_bar.xml

@@ -136,20 +136,17 @@
     @LayoutlibDelegate
     /*package*/ static Bitmap nativeDecodeFileDescriptor(FileDescriptor fd,
             Rect padding, Options opts) {
-        opts.inBitmap = null;
         return null;
     }
 
     @LayoutlibDelegate
     /*package*/ static Bitmap nativeDecodeAsset(int asset, Rect padding, Options opts) {
-        opts.inBitmap = null;
         return null;
     }
 
     @LayoutlibDelegate
     /*package*/ static Bitmap nativeDecodeByteArray(byte[] data, int offset,
             int length, Options opts) {
-        opts.inBitmap = null;
         return null;
     }
 
@@ -159,9 +156,4 @@
         // BitmapFactory.finishDecode();
         return chunk;
     }
-
-    @LayoutlibDelegate
-    /*package*/ static boolean nativeIsSeekable(FileDescriptor fd) {
-        return true;
-    }
 }

tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_back_default.png

@@ -79,13 +79,6 @@ public String getSupportMessage() {
         return sManager.addNewDelegate(newDelegate);
     }
 
-    @LayoutlibDelegate
-    /*package*/ static int nativePostCreate(int native_shader, int native_bitmap,
-            int shaderTileModeX, int shaderTileModeY) {
-        // pass, not needed.
-        return 0;
-    }
-
     // ---- Private delegate/helper methods ----
 
     private BitmapShader_Delegate(java.awt.image.BufferedImage image,

tools/layoutlib/bridge/resources/bars/mdpi/ic_sysbar_home_default.png

@@ -62,8 +62,6 @@ public final class Bitmap_Delegate {
     private final Config mConfig;
     private BufferedImage mImage;
     private boolean mHasAlpha = true;
-    private int mGenerationId = 0;
-
 
     // ---- Public Helper methods ----
 
@@ -186,15 +184,6 @@ public boolean hasAlpha() {
         return mHasAlpha && mConfig != Config.RGB_565;
     }
 
-    /**
-     * Update the generationId.
-     *
-     * @see Bitmap#getGenerationId()
-     */
-    public void change() {
-        mGenerationId++;
-    }
-
     // ---- native methods ----
 
     @LayoutlibDelegate
@@ -394,16 +383,6 @@ public void change() {
                 "Bitmap.copyPixelsFromBuffer is not supported.", null, null /*data*/);
     }
 
-    @LayoutlibDelegate
-    /*package*/ static int nativeGenerationId(int nativeBitmap) {
-        Bitmap_Delegate delegate = sManager.getDelegate(nativeBitmap);
-        if (delegate == null) {
-            return 0;
-        }
-
-        return delegate.mGenerationId;
-    }
-
     @LayoutlibDelegate
     /*package*/ static Bitmap nativeCreateFromParcel(Parcel p) {
         // This is only called by Bitmap.CREATOR (Parcelable.Creator<Bitmap>), which is only
@@ -525,7 +504,7 @@ private static Bitmap createBitmap(Bitmap_Delegate delegate, boolean isMutable,
         int nativeInt = sManager.addNewDelegate(delegate);
 
         // and create/return a new Bitmap with it
-        return new Bitmap(nativeInt, null /* buffer */, isMutable, null /*ninePatchChunk*/, density);
+        return new Bitmap(nativeInt, isMutable, null /*ninePatchChunk*/, density);
     }
 
     /**