Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Using initial activity layout to position the launching activity."

Browse Source
This commit is contained in:
Filip Gruszczynski
2015-08-24 14:39:03 +00:00
committed by Android (Google) Code Review
parent 9869ed1165 9b1ce52f25
commit db0fa33f44
9 changed files with 205 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/pm/ActivityInfo.java
View File

@@ -719,6 +719,7 @@ public class ActivityInfo extends ComponentInfo
maxRecents = orig.maxRecents;
resizeable = orig.resizeable;
lockTaskLaunchMode = orig.lockTaskLaunchMode;
initialLayout = orig.initialLayout;
}
/**

13
core/java/android/content/pm/PackageParser.java
View File

@@ -3307,25 +3307,25 @@ public class PackageParser {
int height = -1;
float heightFraction = -1f;
final int widthType = sw.getType(
com.android.internal.R.styleable.AndroidManifestInitialLayout_activity_width);
com.android.internal.R.styleable.AndroidManifestInitialLayout_activityWidth);
if (widthType == TypedValue.TYPE_FRACTION) {
widthFraction = sw.getFraction(
com.android.internal.R.styleable.AndroidManifestInitialLayout_activity_width,
com.android.internal.R.styleable.AndroidManifestInitialLayout_activityWidth,
1, 1, -1);
} else if (widthType == TypedValue.TYPE_DIMENSION) {
width = sw.getDimensionPixelSize(
com.android.internal.R.styleable.AndroidManifestInitialLayout_activity_width,
com.android.internal.R.styleable.AndroidManifestInitialLayout_activityWidth,
-1);
}
final int heightType = sw.getType(
com.android.internal.R.styleable.AndroidManifestInitialLayout_activity_height);
com.android.internal.R.styleable.AndroidManifestInitialLayout_activityHeight);
if (heightType == TypedValue.TYPE_FRACTION) {
heightFraction = sw.getFraction(
com.android.internal.R.styleable.AndroidManifestInitialLayout_activity_height,
com.android.internal.R.styleable.AndroidManifestInitialLayout_activityHeight,
1, 1, -1);
} else if (heightType == TypedValue.TYPE_DIMENSION) {
height = sw.getDimensionPixelSize(
com.android.internal.R.styleable.AndroidManifestInitialLayout_activity_height,
com.android.internal.R.styleable.AndroidManifestInitialLayout_activityHeight,
-1);
}
int gravity = sw.getInt(
@@ -3415,6 +3415,7 @@ public class PackageParser {
info.uiOptions = target.info.uiOptions;
info.parentActivityName = target.info.parentActivityName;
info.maxRecents = target.info.maxRecents;
info.initialLayout = target.info.initialLayout;
Activity a = new Activity(mParseActivityAliasArgs, info);
if (outError[0] != null) {