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

Commit 14a79bd1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge changes I8d546487,Ib62d357f 

* changes:
  Allow resizeableActivity to be specified at the application level
  Renamed manifest attributes initialWidth/Height to defaultWidth/Height
parents 174d36d8 6afdf91b

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -437,7 +437,9 @@ package android { 
    field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494

    field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494

    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int defaultHeight = 16844021; // 0x10104f5

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultWidth = 16844020; // 0x10104f4

    field public static final int delay = 16843212; // 0x10101cc

    field public static final int delay = 16843212; // 0x10101cc

    field public static final int dependency = 16843244; // 0x10101ec

    field public static final int dependency = 16843244; // 0x10101ec

    field public static final int descendantFocusability = 16842993; // 0x10100f1

    field public static final int descendantFocusability = 16842993; // 0x10100f1
@@ -680,10 +682,8 @@ package android { 
    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initialHeight = 16844021; // 0x10104f5

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialLayout = 16843345; // 0x1010251

    field public static final int initialLayout = 16843345; // 0x1010251

    field public static final int initialWidth = 16844020; // 0x10104f4

    field public static final int innerRadius = 16843359; // 0x101025f

    field public static final int innerRadius = 16843359; // 0x101025f

    field public static final int innerRadiusRatio = 16843163; // 0x101019b

    field public static final int innerRadiusRatio = 16843163; // 0x101019b

    field public static final deprecated int inputMethod = 16843112; // 0x1010168

    field public static final deprecated int inputMethod = 16843112; // 0x1010168

api/system-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -532,7 +532,9 @@ package android { 
    field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494

    field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494

    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int defaultHeight = 16844021; // 0x10104f5

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultWidth = 16844020; // 0x10104f4

    field public static final int delay = 16843212; // 0x10101cc

    field public static final int delay = 16843212; // 0x10101cc

    field public static final int dependency = 16843244; // 0x10101ec

    field public static final int dependency = 16843244; // 0x10101ec

    field public static final int descendantFocusability = 16842993; // 0x10100f1

    field public static final int descendantFocusability = 16842993; // 0x10100f1
@@ -775,10 +777,8 @@ package android { 
    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initialHeight = 16844021; // 0x10104f5

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialLayout = 16843345; // 0x1010251

    field public static final int initialLayout = 16843345; // 0x1010251

    field public static final int initialWidth = 16844020; // 0x10104f4

    field public static final int innerRadius = 16843359; // 0x101025f

    field public static final int innerRadius = 16843359; // 0x101025f

    field public static final int innerRadiusRatio = 16843163; // 0x101019b

    field public static final int innerRadiusRatio = 16843163; // 0x101019b

    field public static final deprecated int inputMethod = 16843112; // 0x1010168

    field public static final deprecated int inputMethod = 16843112; // 0x1010168

api/test-current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -437,7 +437,9 @@ package android { 
    field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494

    field public static final deprecated int dayOfWeekBackground = 16843924; // 0x1010494

    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final deprecated int dayOfWeekTextAppearance = 16843925; // 0x1010495

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int debuggable = 16842767; // 0x101000f

    field public static final int defaultHeight = 16844021; // 0x10104f5

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultValue = 16843245; // 0x10101ed

    field public static final int defaultWidth = 16844020; // 0x10104f4

    field public static final int delay = 16843212; // 0x10101cc

    field public static final int delay = 16843212; // 0x10101cc

    field public static final int dependency = 16843244; // 0x10101ec

    field public static final int dependency = 16843244; // 0x10101ec

    field public static final int descendantFocusability = 16842993; // 0x10100f1

    field public static final int descendantFocusability = 16842993; // 0x10100f1
@@ -680,10 +682,8 @@ package android { 
    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initialHeight = 16844021; // 0x10104f5

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialLayout = 16843345; // 0x1010251

    field public static final int initialLayout = 16843345; // 0x1010251

    field public static final int initialWidth = 16844020; // 0x10104f4

    field public static final int innerRadius = 16843359; // 0x101025f

    field public static final int innerRadius = 16843359; // 0x101025f

    field public static final int innerRadiusRatio = 16843163; // 0x101019b

    field public static final int innerRadiusRatio = 16843163; // 0x101019b

    field public static final deprecated int inputMethod = 16843112; // 0x1010168

    field public static final deprecated int inputMethod = 16843112; // 0x1010168

core/java/android/content/pm/ActivityInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -839,7 +839,7 @@ public class ActivityInfo extends ComponentInfo 
                    + lockTaskLaunchModeToString(lockTaskLaunchMode));

                    + lockTaskLaunchModeToString(lockTaskLaunchMode));

        }

        }

        if (layout != null) {

        if (layout != null) {

            pw.println(prefix + "initialLayout=" + layout.width + "|"

            pw.println(prefix + "defaultLayout=" + layout.width + "|"

                    + layout.widthFraction + ", " + layout.height + "|"

                    + layout.widthFraction + ", " + layout.height + "|"

                    + layout.heightFraction + ", " + layout.gravity);

                    + layout.heightFraction + ", " + layout.gravity);

        }

        }

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -514,6 +514,14 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     */

     */

    public static final int PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER = 1 << 10;

    public static final int PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER = 1 << 10;





    /**

     * When set, the activities associated with this application are resizeable by default.

     * @see android.R.styleable#AndroidManifestActivity_resizeableActivity

     *

     * @hide

     */

    public static final int PRIVATE_FLAG_RESIZEABLE_ACTIVITIES = 1 << 11;



    /**

    /**

     * Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.

     * Private/hidden flags. See {@code PRIVATE_FLAG_...} constants.

     * {@hide}

     * {@hide}