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

Commit acd27d5f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Deprecate long-obsolete android:anyDensity" into rvc-dev am: e2e7cd5d am: 026b6088 

Change-Id: Ib0e20c7f3f6768e8cdbbdb4acaa03beceae1b672
parents a2e4deff 026b6088

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ package android { 
    field public static final int animationOrder = 16843214; // 0x10101ce

    field @Deprecated public static final int animationResolution = 16843546; // 0x101031a

    field public static final int antialias = 16843034; // 0x101011a

    field public static final int anyDensity = 16843372; // 0x101026c

    field @Deprecated public static final int anyDensity = 16843372; // 0x101026c

    field public static final int apduServiceBanner = 16843757; // 0x10103ed

    field public static final int apiKey = 16843281; // 0x1010211

    field public static final int appCategory = 16844101; // 0x1010545
@@ -11475,7 +11475,7 @@ package android.content.pm { 
    field public static final int FLAG_SUPPORTS_LARGE_SCREENS = 2048; // 0x800

    field public static final int FLAG_SUPPORTS_NORMAL_SCREENS = 1024; // 0x400

    field public static final int FLAG_SUPPORTS_RTL = 4194304; // 0x400000

    field public static final int FLAG_SUPPORTS_SCREEN_DENSITIES = 8192; // 0x2000

    field @Deprecated public static final int FLAG_SUPPORTS_SCREEN_DENSITIES = 8192; // 0x2000

    field public static final int FLAG_SUPPORTS_SMALL_SCREENS = 512; // 0x200

    field public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 524288; // 0x80000

    field public static final int FLAG_SUSPENDED = 1073741824; // 0x40000000

core/java/android/content/pm/ApplicationInfo.java

+4 −0
Original line number Diff line number Diff line
@@ -247,7 +247,11 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * accommodate different screen densities.  Corresponds to

     * {@link android.R.styleable#AndroidManifestSupportsScreens_anyDensity

     * android:anyDensity}.

     *

     * @deprecated Set by default when targeting API 4 or higher and apps

     *             should not set this to false.

     */

    @Deprecated

    public static final int FLAG_SUPPORTS_SCREEN_DENSITIES = 1<<13;

    

    /**

core/res/res/values/attrs_manifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -2266,9 +2266,9 @@ 
             a newer platform that supports more screens. -->

        <attr name="resizeable" format="boolean" />

        <!-- Indicates whether the application can accommodate any screen

             density.  Older applications are assumed to not be able to,

             new ones able to.  You can explicitly supply your abilities

             here. -->

             density. This is assumed true if targetSdkVersion is 4 or higher.

             @deprecated Should always be true by default and not overridden.

              -->

        <attr name="anyDensity" format="boolean" />

    </declare-styleable>