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

* commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
  Update javadoc for DEFAULT_FEATURES deprecation.
This commit is contained in:
Bryce Lee
2015-01-13 19:01:24 +00:00
committed by Android Git Automerger

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