Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e6fbb36 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

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

automerge: e036ce2e

* commit 'e036ce2e':
  Update javadoc for DEFAULT_FEATURES deprecation.
parents 1accc9c1 e036ce2e

core/java/android/view/Window.java

+4 −1
Original line number Diff line number Diff line
@@ -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) |