diff options
| author | Bryce Lee <brycelee@google.com> | 2015-01-13 21:07:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-13 21:07:16 +0000 |
| commit | e843e24681548123f95128b946222aa736b988af (patch) | |
| tree | 405a0bc726662c328319864e4fb9fb31ceff9a8e | |
| parent | 9a67d191ab9e3f7c5ac1c1f1cce1cb87e1ebd547 (diff) | |
| parent | 7e6fbb361be7a0045b8c71f0b8c56f113121a7d4 (diff) | |
| download | frameworks_base-e843e24681548123f95128b946222aa736b988af.zip frameworks_base-e843e24681548123f95128b946222aa736b988af.tar.gz frameworks_base-e843e24681548123f95128b946222aa736b988af.tar.bz2 | |
am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev automerge: e036ce2
automerge: 7e6fbb3
* commit '7e6fbb361be7a0045b8c71f0b8c56f113121a7d4':
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) | |