commit e036ce2e7044efcc8be71241a7e0a1523955f20c
author Bryce Lee <brycelee@google.com> Tue Jan 13 19:01:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 13 19:01:24 2015 +0000
tree bd1ea271e45c2b752ef46c74f832a57fd763b6b3
parent 57744dd139f3d30ed1031319dd64b289a68ac3ba
parent 9320e9f0a6af9269bc145ec7ab3d4b351f0614af

am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev

* commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
  Update javadoc for DEFAULT_FEATURES deprecation.

core/java/android/view/Window.java

diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 3d5d3fa..3f2f3a5 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -156,7 +156,10 @@
     public static final String NAVIGATION_BAR_BACKGROUND_TRANSITION_NAME =
             "android:navigation:background";
 
-    /** The default features enabled */
+    /**
+     * The default features enabled.
+     * @deprecated use {@link #getDefaultFeatures(android.content.Context)} instead.
+     */
     @Deprecated
     @SuppressWarnings({"PointlessBitwiseExpression"})
     protected static final int DEFAULT_FEATURES = (1 << FEATURE_OPTIONS_PANEL) |