summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-10-07 10:07:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 10:07:19 -0700
commit1fc7bd3eb2ee9598665013c843b4bbd26d74fd26 (patch)
treefc727b79518620406d1403f457a662161b00b296 /core/java/android
parentf2ec90f26ca29f3fe1237f8b593a0f2d6f25de80 (diff)
parent619fc89aa176a4fa2895933d536987bb278acfb5 (diff)
am 619fc89a: Merge "Fix transparent -> translucent reference in private docs." into klp-dev
* commit '619fc89aa176a4fa2895933d536987bb278acfb5': Fix transparent -> translucent reference in private docs.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/WindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index ea3c9311c4df..0ce4da5c4dc5 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1088,7 +1088,7 @@ public interface WindowManager extends ViewManager {
* {@hide} */
public static final int PRIVATE_FLAG_SYSTEM_ERROR = 0x00000100;
- /** Window flag: maintain the previous transparent decor state when this window
+ /** Window flag: maintain the previous translucent decor state when this window
* becomes top-most.
* {@hide} */
public static final int PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR = 0x00000200;