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

Commit ebf7a56e authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Rename minWidth/Height attributes" into nyc-dev am: 42b3acf9 am: 81ce16a2 

am: c59e70d5

* commit 'c59e70d5':
  Rename minWidth/Height attributes

Change-Id: I3ecfd0db6eaa56f1ef3e39cb1b76f62f03074b35
parents 4083d8bf c59e70d5

api/current.txt

+2 −4
Original line number Original line Diff line number Diff line
@@ -861,8 +861,6 @@ package android { 
    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int mipMap = 16843725; // 0x10103cd

    field public static final int mipMap = 16843725; // 0x10103cd
@@ -9332,8 +9330,8 @@ package android.content.pm { 
    field public final int gravity;

    field public final int gravity;

    field public final int height;

    field public final int height;

    field public final float heightFraction;

    field public final float heightFraction;

    field public final int minimalHeight;

    field public final int minHeight;

    field public final int minimalWidth;

    field public final int minWidth;

    field public final int width;

    field public final int width;

    field public final float widthFraction;

    field public final float widthFraction;

  }

  }

api/removed.txt

+28 −0
Original line number Original line Diff line number Diff line 
package android {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

  }



}



package android.app {

package android.app {





  public class Notification implements android.os.Parcelable {

  public class Notification implements android.os.Parcelable {
@@ -483,3 +497,17 @@ package android.widget { 




}

}





package com.android.internal {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

  }



}

api/system-current.txt

+2 −4
Original line number Original line Diff line number Diff line
@@ -967,8 +967,6 @@ package android { 
    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int mipMap = 16843725; // 0x10103cd

    field public static final int mipMap = 16843725; // 0x10103cd
@@ -9672,8 +9670,8 @@ package android.content.pm { 
    field public final int gravity;

    field public final int gravity;

    field public final int height;

    field public final int height;

    field public final float heightFraction;

    field public final float heightFraction;

    field public final int minimalHeight;

    field public final int minHeight;

    field public final int minimalWidth;

    field public final int minWidth;

    field public final int width;

    field public final int width;

    field public final float widthFraction;

    field public final float widthFraction;

  }

  }

api/system-removed.txt

+28 −0
Original line number Original line Diff line number Diff line 
package android {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

  }



}



package android.app {

package android.app {





  public class Notification implements android.os.Parcelable {

  public class Notification implements android.os.Parcelable {
@@ -481,3 +495,17 @@ package android.widget { 




}

}





package com.android.internal {



  public static final class R.attr {

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

  }



  public static final class R.styleable {

    field public static final int AndroidManifestLayout_minimalHeight = 6; // 0x6

    field public static final int AndroidManifestLayout_minimalWidth = 5; // 0x5

  }



}

api/test-current.txt

+2 −4
Original line number Original line Diff line number Diff line
@@ -861,8 +861,6 @@ package android { 
    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minResizeWidth = 16843669; // 0x1010395

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minSdkVersion = 16843276; // 0x101020c

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minWidth = 16843071; // 0x101013f

    field public static final int minimalHeight = 16844067; // 0x1010523

    field public static final int minimalWidth = 16844022; // 0x10104f6

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumHorizontalAngle = 16843901; // 0x101047d

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int minimumVerticalAngle = 16843902; // 0x101047e

    field public static final int mipMap = 16843725; // 0x10103cd

    field public static final int mipMap = 16843725; // 0x10103cd
@@ -9341,8 +9339,8 @@ package android.content.pm { 
    field public final int gravity;

    field public final int gravity;

    field public final int height;

    field public final int height;

    field public final float heightFraction;

    field public final float heightFraction;

    field public final int minimalHeight;

    field public final int minHeight;

    field public final int minimalWidth;

    field public final int minWidth;

    field public final int width;

    field public final int width;

    field public final float widthFraction;

    field public final float widthFraction;

  }

  }