diff options
| author | Bryce Lee <brycelee@google.com> | 2015-01-13 19:05:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 19:05:15 +0000 |
| commit | 7e6fbb361be7a0045b8c71f0b8c56f113121a7d4 (patch) | |
| tree | 93e7f0ab09e58dfb8364a5fa9b8831a9c96f6f5a | |
| parent | 1accc9c12ba9610bc592666c5f46be727f92e68d (diff) | |
| parent | e036ce2e7044efcc8be71241a7e0a1523955f20c (diff) | |
| download | frameworks_base-7e6fbb361be7a0045b8c71f0b8c56f113121a7d4.zip frameworks_base-7e6fbb361be7a0045b8c71f0b8c56f113121a7d4.tar.gz frameworks_base-7e6fbb361be7a0045b8c71f0b8c56f113121a7d4.tar.bz2 | |
am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev
automerge: e036ce2
* commit 'e036ce2e7044efcc8be71241a7e0a1523955f20c':
Update javadoc for DEFAULT_FEATURES deprecation.
| -rw-r--r-- | core/java/android/view/Window.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 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) | |