diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 12 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 16 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 4 |
7 files changed, 23 insertions, 23 deletions
diff --git a/api/current.txt b/api/current.txt index 023999f51b71..927e2c4120fa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 diff --git a/api/system-current.txt b/api/system-current.txt index fce3d4b4c201..fdfac1d929a1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/api/test-current.txt b/api/test-current.txt index 73315f6fba53..1870cbeccd59 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 10b8a30a2fb1..43a0cc77d492 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -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); } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 44cd0039dc09..970a0b5e83b2 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -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( diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 6eba78a4ce2b..c86874f5ac10 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -2238,21 +2238,21 @@ <!-- <code>layout</code> tag allows configuring the layout for the activity within multi-window environment. --> <declare-styleable name="AndroidManifestLayout" parent="AndroidManifestActivity"> - <!-- Initial width of the activity. Can be either a fixed value or fraction, in which case + <!-- Default width of the activity. Can be either a fixed value or fraction, in which case the width will be constructed as a fraction of the total available width. --> - <attr name="initialWidth" format="dimension|fraction" /> - <!-- Initial height of the activity. Can be either a fixed value or fraction, in which case + <attr name="defaultWidth" format="dimension|fraction" /> + <!-- Default height of the activity. Can be either a fixed value or fraction, in which case the height will be constructed as a fraction of the total available height. --> - <attr name="initialHeight" format="dimension|fraction" /> + <attr name="defaultHeight" format="dimension|fraction" /> <!-- Where to initially position the activity inside the available space. Uses constants defined in {@link android.view.Gravity}. --> <attr name="gravity" /> <!-- Minimal height of the activity. - <p>NOTE: A task's root activity value is applied to all additional activities launched - in the task. That is if the root activity of a task set minimal size, then the system - will set the same minimal size on all other activities in the task. It will also - ignore any other minimal size attributes of non-root activities. --> + <p><strong>NOTE:</strong> A task's root activity value is applied to all additional + activities launched in the task. That is if the root activity of a task set minimal size, + then the system will set the same minimal size on all other activities in the task. It will + also ignore any other minimal size attributes of non-root activities. --> <attr name="minimalSize" format="dimension" /> </declare-styleable> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index a2ad09b248c3..bbbb963f4dff 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2662,8 +2662,8 @@ <public type="attr" name="listMenuViewStyle" /> <public type="attr" name="subMenuArrow" /> - <public type="attr" name="initialWidth" /> - <public type="attr" name="initialHeight" /> + <public type="attr" name="defaultWidth" /> + <public type="attr" name="defaultHeight" /> <public type="attr" name="minimalSize" /> <public type="attr" name="resizeableActivity" /> <public type="attr" name="supportsPictureInPicture" /> |