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

Commit 09d91ca4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am fefe7a22: Merge "Fix build." into kraken

parents 2de49557 fefe7a22

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

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * Value for {@link #flags}: true when the application's window can be

     * increased in size for larger screens.  Corresponds to

     * {@link android.R.styleable#AndroidManifestSupportsScreens_largeScreens

     * android:smallScreens}.

     * android:largeScreens}.

     */

    public static final int FLAG_SUPPORTS_LARGE_SCREENS = 1<<11;
@@ -268,7 +268,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * Value for {@link #flags}: true when the application's window can be

     * increased in size for extra large screens.  Corresponds to

     * {@link android.R.styleable#AndroidManifestSupportsScreens_xlargeScreens

     * android:smallScreens}.

     * android:xlargeScreens}.

     */

    public static final int FLAG_SUPPORTS_XLARGE_SCREENS = 1<<19;

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ 
     =============================================================== -->

     

  <public type="attr" name="logo" id="0x010102be" />

  <public type="attr" name="xlargeScreens" id="0x010102bf" />



  <public-padding type="attr" name="kraken_resource_pad" end="0x01010300" />

  <public-padding type="id" name="kraken_resource_pad" end="0x01020040" />