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

Commit 7e1c4c6d authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents fa39f3fb 73ef5d4e

api/current.xml

+37 −3
Original line number Diff line number Diff line
@@ -48120,7 +48120,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="className" type="android.content.ComponentName">

<parameter name="component" type="android.content.ComponentName">

</parameter>

<parameter name="flags" type="int">

</parameter>
@@ -48516,6 +48516,23 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getProviderInfo"

 return="android.content.pm.ProviderInfo"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="component" type="android.content.ComponentName">

</parameter>

<parameter name="flags" type="int">

</parameter>

<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getReceiverInfo"

 return="android.content.pm.ActivityInfo"

 abstract="true"
@@ -48526,7 +48543,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="className" type="android.content.ComponentName">

<parameter name="component" type="android.content.ComponentName">

</parameter>

<parameter name="flags" type="int">

</parameter>
@@ -48588,7 +48605,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="className" type="android.content.ComponentName">

<parameter name="component" type="android.content.ComponentName">

</parameter>

<parameter name="flags" type="int">

</parameter>
@@ -158313,6 +158330,23 @@ 
<parameter name="flags" type="int">

</parameter>

</method>

<method name="getProviderInfo"

 return="android.content.pm.ProviderInfo"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="className" type="android.content.ComponentName">

</parameter>

<parameter name="flags" type="int">

</parameter>

<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getReceiverInfo"

 return="android.content.pm.ActivityInfo"

 abstract="false"

awt/Android.mk

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
#

# Copyright (C) 2008 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_JAVA_RESOURCE_DIRS := resources



LOCAL_JAVA_LIBRARIES := core framework



LOCAL_MODULE:= android.awt



LOCAL_DX_FLAGS := --core-library



#include $(BUILD_JAVA_LIBRARY)

awt/com/android/internal/awt/AndroidGraphics2D.java

deleted100644 → 0
+0 −1354

File deleted.

Preview size limit exceeded, changes collapsed.

awt/com/android/internal/awt/AndroidGraphicsConfiguration.java

deleted100644 → 0
+0 −96
Original line number Diff line number Diff line 
/*

 * Copyright 2007, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); 

 * you may not use this file except in compliance with the License. 

 * You may obtain a copy of the License at 

 *

 *     http://www.apache.org/licenses/LICENSE-2.0 

 *

 * Unless required by applicable law or agreed to in writing, software 

 * distributed under the License is distributed on an "AS IS" BASIS, 

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

 * See the License for the specific language governing permissions and 

 * limitations under the License.

 */



package com.android.internal.awt;



import com.android.internal.awt.AndroidGraphics2D;



import java.awt.GraphicsConfiguration;

import java.awt.GraphicsDevice;

import java.awt.Rectangle;

import java.awt.geom.AffineTransform;

import java.awt.image.BufferedImage;

import java.awt.image.ColorModel;

import java.awt.image.VolatileImage;



import android.graphics.Canvas;



public class AndroidGraphicsConfiguration extends GraphicsConfiguration {



    @Override

    public BufferedImage createCompatibleImage(int width, int height) {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public BufferedImage createCompatibleImage(int width, int height,

            int transparency) {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public VolatileImage createCompatibleVolatileImage(int width, int height) {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public VolatileImage createCompatibleVolatileImage(int width, int height,

            int transparency) {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public Rectangle getBounds() {

        Canvas c = AndroidGraphics2D.getAndroidCanvas();

        if(c != null)

            return new Rectangle(0, 0, c.getWidth(), c.getHeight());

        return null;

    }



    @Override

    public ColorModel getColorModel() {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public ColorModel getColorModel(int transparency) {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public AffineTransform getDefaultTransform() {

        return new AffineTransform();

    }



    @Override

    public GraphicsDevice getDevice() {

        // TODO Auto-generated method stub

        return null;

    }



    @Override

    public AffineTransform getNormalizingTransform() {

        // TODO Auto-generated method stub

        return null;

    }



}

awt/com/android/internal/awt/AndroidGraphicsFactory.java

deleted100644 → 0
+0 −87
Original line number Diff line number Diff line 
/*

 * Copyright 2007, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License"); 

 * you may not use this file except in compliance with the License. 

 * You may obtain a copy of the License at 

 *

 *     http://www.apache.org/licenses/LICENSE-2.0 

 *

 * Unless required by applicable law or agreed to in writing, software 

 * distributed under the License is distributed on an "AS IS" BASIS, 

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

 * See the License for the specific language governing permissions and 

 * limitations under the License.

 */



package com.android.internal.awt;



import java.awt.Font;

import java.awt.FontMetrics;

import java.awt.Graphics2D;

import java.awt.GraphicsEnvironment;

import java.awt.peer.FontPeer;



import org.apache.harmony.awt.gl.MultiRectArea;

import org.apache.harmony.awt.gl.font.AndroidFont;

import org.apache.harmony.awt.gl.font.FontManager;

import org.apache.harmony.awt.gl.font.FontMetricsImpl;

import org.apache.harmony.awt.gl.font.AndroidFontManager;

import org.apache.harmony.awt.wtk.NativeWindow;

import org.apache.harmony.awt.wtk.WindowFactory;

import org.apache.harmony.awt.gl.CommonGraphics2DFactory;



import android.graphics.Canvas;

import android.graphics.Paint;

import android.content.Context;



public class AndroidGraphicsFactory extends CommonGraphics2DFactory {

    

    public GraphicsEnvironment createGraphicsEnvironment(WindowFactory wf) {

        // TODO Auto-generated method stub

        return null;

    }



    public Font embedFont(String fontFilePath) {

        // TODO Auto-generated method stub

        return null;

    }



    public FontManager getFontManager() {

        return AndroidFontManager.inst;

    }



    public FontMetrics getFontMetrics(Font font) {

        return new FontMetricsImpl(font);

    }



    public FontPeer getFontPeer(Font font) {

        //return getFontManager().getFontPeer(font.getName(), font.getStyle(), font.getSize());

        return new AndroidFont(font.getName(), font.getStyle(), font.getSize());

    }



    public Graphics2D getGraphics2D(NativeWindow win, int translateX,

            int translateY, MultiRectArea clip) {

        // TODO Auto-generated method stub

        return null;

    }



    public Graphics2D getGraphics2D(NativeWindow win, int translateX,

            int translateY, int width, int height) {

        // TODO Auto-generated method stub

        return null;

    }



    public Graphics2D getGraphics2D(Context ctx, Canvas c, Paint p) {

        return AndroidGraphics2D.getInstance(ctx, c, p);

    }



    public Graphics2D getGraphics2D(Canvas c, Paint p) {

        throw new RuntimeException("Not supported!");

    }



    public Graphics2D getGraphics2D() {

        return AndroidGraphics2D.getInstance();

    }



}