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

automerge: e036ce2

* commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c':
  Update javadoc for DEFAULT_FEATURES deprecation.
This commit is contained in:
Bryce Lee
2015-01-13 19:05:15 +00:00
committed by android-build-merger

View File

@@ -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) |