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

Commit b12e1099 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Renamed manifest attributes initialWidth/Height to defaultWidth/Height 

Per feedback from API council.

Bug: 26508215
Change-Id: Ib62d357f0e6309ad6f6305ba5ac376c5e3ab04e7
parent 2a25a627

api/current.txt

+2 −2
Original line number 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 dayOfWeekTextAppearance = 16843925; // 0x1010495

    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 defaultWidth = 16844020; // 0x10104f4

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

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

    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 inflatedId = 16842995; // 0x10100f3

    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 initialLayout = 16843345; // 0x1010251

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

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

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

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

api/system-current.txt

+2 −2
Original line number 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 dayOfWeekTextAppearance = 16843925; // 0x1010495

    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 defaultWidth = 16844020; // 0x10104f4

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

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

    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 inflatedId = 16842995; // 0x10100f3

    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 initialLayout = 16843345; // 0x1010251

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

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

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

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

api/test-current.txt

+2 −2
Original line number 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 dayOfWeekTextAppearance = 16843925; // 0x1010495

    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 defaultWidth = 16844020; // 0x10104f4

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

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

    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 inflatedId = 16842995; // 0x10100f3

    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 initialLayout = 16843345; // 0x1010251

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

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

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

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

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

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

        }

        if (layout != null) {

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

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

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

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

        }

core/java/android/content/pm/PackageParser.java

+6 −6
Original line number Diff line number Diff line
@@ -3378,25 +3378,25 @@ public class PackageParser { 
        int height = -1;

        float heightFraction = -1f;

        final int widthType = sw.getType(

                com.android.internal.R.styleable.AndroidManifestLayout_initialWidth);

                com.android.internal.R.styleable.AndroidManifestLayout_defaultWidth);

        if (widthType == TypedValue.TYPE_FRACTION) {

            widthFraction = sw.getFraction(

                    com.android.internal.R.styleable.AndroidManifestLayout_initialWidth,

                    com.android.internal.R.styleable.AndroidManifestLayout_defaultWidth,

                    1, 1, -1);

        } else if (widthType == TypedValue.TYPE_DIMENSION) {

            width = sw.getDimensionPixelSize(

                    com.android.internal.R.styleable.AndroidManifestLayout_initialWidth,

                    com.android.internal.R.styleable.AndroidManifestLayout_defaultWidth,

                    -1);

        }

        final int heightType = sw.getType(

                com.android.internal.R.styleable.AndroidManifestLayout_initialHeight);

                com.android.internal.R.styleable.AndroidManifestLayout_defaultHeight);

        if (heightType == TypedValue.TYPE_FRACTION) {

            heightFraction = sw.getFraction(

                    com.android.internal.R.styleable.AndroidManifestLayout_initialHeight,

                    com.android.internal.R.styleable.AndroidManifestLayout_defaultHeight,

                    1, 1, -1);

        } else if (heightType == TypedValue.TYPE_DIMENSION) {

            height = sw.getDimensionPixelSize(

                    com.android.internal.R.styleable.AndroidManifestLayout_initialHeight,

                    com.android.internal.R.styleable.AndroidManifestLayout_defaultHeight,

                    -1);

        }

        int gravity = sw.getInt(