summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
Diffstat (limited to 'api')
-rw-r--r--api/17.txt9
-rw-r--r--api/current.txt7
2 files changed, 14 insertions, 2 deletions
diff --git a/api/17.txt b/api/17.txt
index 84c2a93..31ed755 100644
--- a/api/17.txt
+++ b/api/17.txt
@@ -7094,7 +7094,7 @@ package android.content.res {
method public int getIndexCount();
method public int getInt(int, int);
method public int getInteger(int, int);
- method public deprecated int getLayoutDimension(int, java.lang.String);
+ method public int getLayoutDimension(int, java.lang.String);
method public int getLayoutDimension(int, int);
method public java.lang.String getNonResourceString(int);
method public java.lang.String getPositionDescription();
@@ -8263,6 +8263,7 @@ package android.graphics {
method public int getScaledWidth(int);
method public final int getWidth();
method public final boolean hasAlpha();
+ method public final boolean hasMipMap();
method public final boolean isMutable();
method public final boolean isPremultiplied();
method public final boolean isRecycled();
@@ -8271,6 +8272,7 @@ package android.graphics {
method public boolean sameAs(android.graphics.Bitmap);
method public void setDensity(int);
method public void setHasAlpha(boolean);
+ method public final void setHasMipMap(boolean);
method public void setPixel(int, int, int);
method public void setPixels(int[], int, int, int, int, int, int);
method public void writeToParcel(android.os.Parcel, int);
@@ -25975,6 +25977,11 @@ package android.view {
ctor public WindowManager.BadTokenException(java.lang.String);
}
+ public static class WindowManager.InvalidDisplayException extends java.lang.RuntimeException {
+ ctor public WindowManager.InvalidDisplayException();
+ ctor public WindowManager.InvalidDisplayException(java.lang.String);
+ }
+
public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
ctor public WindowManager.LayoutParams();
ctor public WindowManager.LayoutParams(int);
diff --git a/api/current.txt b/api/current.txt
index 5462aee..31ed755 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16151,7 +16151,7 @@ package android.os {
public class Looper {
method public void dump(android.util.Printer, java.lang.String);
- method public static synchronized android.os.Looper getMainLooper();
+ method public static android.os.Looper getMainLooper();
method public java.lang.Thread getThread();
method public static void loop();
method public static android.os.Looper myLooper();
@@ -25977,6 +25977,11 @@ package android.view {
ctor public WindowManager.BadTokenException(java.lang.String);
}
+ public static class WindowManager.InvalidDisplayException extends java.lang.RuntimeException {
+ ctor public WindowManager.InvalidDisplayException();
+ ctor public WindowManager.InvalidDisplayException(java.lang.String);
+ }
+
public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
ctor public WindowManager.LayoutParams();
ctor public WindowManager.LayoutParams(int);