diff options
| author | 2017-06-02 17:26:47 +0000 | |
|---|---|---|
| committer | 2017-06-02 17:26:54 +0000 | |
| commit | 0b83588177ed881502f00218e935ece0b0668d03 (patch) | |
| tree | bc38f6ee812c39d229bc53c82e15f2f72982a006 | |
| parent | c672cb5ed9d4547a1933730177cbbfe6abcdb40a (diff) | |
| parent | 39259dd33c11b2ed434a9de36a1a4f5449b21b2b (diff) | |
Merge "Annotate test method visibility in WindowManager" into oc-dev
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 1cad48ead7de..9b5b1a2b9c36 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -47112,6 +47112,7 @@ package android.view { method public void setColorMode(int); method public final void setTitle(java.lang.CharSequence); method public void writeToParcel(android.os.Parcel, int); + field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000 field public static final int ALPHA_CHANGED = 128; // 0x80 field public static final int ANIMATION_CHANGED = 16; // 0x10 field public static final float BRIGHTNESS_OVERRIDE_FULL = 1.0f; @@ -47213,6 +47214,7 @@ package android.view { field public static final deprecated int TYPE_SYSTEM_OVERLAY = 2006; // 0x7d6 field public static final deprecated int TYPE_TOAST = 2005; // 0x7d5 field public static final int TYPE_WALLPAPER = 2013; // 0x7dd + field public java.lang.CharSequence accessibilityTitle; field public float alpha; field public float buttonBrightness; field public float dimAmount; diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 3f91476ac109..3dd8d2aca4fb 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -1903,6 +1903,7 @@ public interface WindowManager extends ViewManager { * * @hide */ + @TestApi public CharSequence accessibilityTitle; /** @@ -2185,6 +2186,7 @@ public interface WindowManager extends ViewManager { /** {@hide} */ public static final int ACCESSIBILITY_ANCHOR_CHANGED = 1 << 24; /** {@hide} */ + @TestApi public static final int ACCESSIBILITY_TITLE_CHANGED = 1 << 25; /** {@hide} */ public static final int EVERYTHING_CHANGED = 0xffffffff; |