Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev

2015-01-13 18:59:34 +00:00
parent 69c22e82e9 aa1008cba4
commit 9320e9f0a6
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -156,7 +156,10 @@ public abstract class Window {
    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) |