summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/removed.txt8
-rw-r--r--core/java/android/view/WindowManager.java1
3 files changed, 9 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 68056b817878..cd75146e5cae 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -35514,7 +35514,6 @@ package android.view {
field public static final int TYPE_CHANGED = 2; // 0x2
field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db
field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc
- field public static final int TYPE_KEYGUARD = 2004; // 0x7d4
field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9
field public static final int TYPE_PHONE = 2002; // 0x7d2
field public static final int TYPE_PRIORITY_PHONE = 2007; // 0x7d7
diff --git a/api/removed.txt b/api/removed.txt
index 458c4221125c..465a18d76efb 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -6,3 +6,11 @@ package android.media {
}
+package android.view {
+
+ public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {
+ field public static final int TYPE_KEYGUARD = 2004; // 0x7d4
+ }
+
+}
+
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 034778ff397a..597d2dd0d1b2 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -346,6 +346,7 @@ public interface WindowManager extends ViewManager {
/**
* Window type: keyguard window.
* In multiuser systems shows on all users' windows.
+ * @removed
*/
public static final int TYPE_KEYGUARD = FIRST_SYSTEM_WINDOW+4;