diff --git a/api/current.txt b/api/current.txt index b581f5c175b17..e672929ef321d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -301,13 +301,13 @@ package android { field public static final int backgroundTint = 16843883; // 0x101046b field public static final int backgroundTintMode = 16843884; // 0x101046c field public static final int backupAgent = 16843391; // 0x101027f - field public static final int backupInForeground = 16844059; // 0x101051b + field public static final int backupInForeground = 16844060; // 0x101051c field public static final int banner = 16843762; // 0x10103f2 field public static final int baseline = 16843548; // 0x101031c field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 - field public static final int bitmap = 16844055; // 0x1010517 + field public static final int bitmap = 16844056; // 0x1010518 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -326,7 +326,7 @@ package android { field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489 field public static final int buttonBarStyle = 16843566; // 0x101032e - field public static final int buttonGravity = 16844031; // 0x10104ff + field public static final int buttonGravity = 16844032; // 0x1010500 field public static final int buttonStyle = 16842824; // 0x1010048 field public static final int buttonStyleInset = 16842826; // 0x101004a field public static final int buttonStyleSmall = 16842825; // 0x1010049 @@ -337,9 +337,9 @@ package android { field public static final int calendarTextColor = 16843931; // 0x101049b field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d - field public static final int canControlMagnification = 16844040; // 0x1010508 - field public static final int canPerformGestures = 16844046; // 0x101050e - field public static final int canRecord = 16844061; // 0x101051d + field public static final int canControlMagnification = 16844041; // 0x1010509 + field public static final int canPerformGestures = 16844047; // 0x101050f + field public static final int canRecord = 16844062; // 0x101051e field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8 field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9 field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 @@ -379,7 +379,7 @@ package android { field public static final int codes = 16843330; // 0x1010242 field public static final int collapseColumns = 16843083; // 0x101014b field public static final int collapseContentDescription = 16843984; // 0x10104d0 - field public static final int collapseIcon = 16844032; // 0x1010500 + field public static final int collapseIcon = 16844033; // 0x1010501 field public static final int color = 16843173; // 0x10101a5 field public static final int colorAccent = 16843829; // 0x1010435 field public static final int colorActivatedHighlight = 16843664; // 0x1010390 @@ -420,12 +420,12 @@ package android { field public static final int contentInsetRight = 16843862; // 0x1010456 field public static final int contentInsetStart = 16843859; // 0x1010453 field public static final int contextClickable = 16844007; // 0x10104e7 - field public static final int contextPopupMenuStyle = 16844034; // 0x1010502 + field public static final int contextPopupMenuStyle = 16844035; // 0x1010503 field public static final int controlX1 = 16843772; // 0x10103fc field public static final int controlX2 = 16843774; // 0x10103fe field public static final int controlY1 = 16843773; // 0x10103fd field public static final int controlY2 = 16843775; // 0x10103ff - field public static final int countDown = 16844060; // 0x101051c + field public static final int countDown = 16844061; // 0x101051d field public static final int country = 16843962; // 0x10104ba field public static final int cropToPadding = 16843043; // 0x1010123 field public static final int cursorVisible = 16843090; // 0x1010152 @@ -443,7 +443,7 @@ package android { 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 defaultToDeviceProtectedStorage = 16844037; // 0x1010505 + field public static final int defaultToDeviceProtectedStorage = 16844038; // 0x1010506 field public static final int defaultValue = 16843245; // 0x10101ed field public static final int defaultWidth = 16844020; // 0x10104f4 field public static final int delay = 16843212; // 0x10101cc @@ -463,7 +463,7 @@ package android { field public static final int dialogTheme = 16843528; // 0x1010308 field public static final int dialogTitle = 16843250; // 0x10101f2 field public static final int digits = 16843110; // 0x1010166 - field public static final int directBootAware = 16844038; // 0x1010506 + field public static final int directBootAware = 16844039; // 0x1010507 field public static final int direction = 16843217; // 0x10101d1 field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1 field public static final int directionPriority = 16843218; // 0x10101d2 @@ -514,8 +514,8 @@ package android { field public static final int enabled = 16842766; // 0x101000e field public static final int end = 16843996; // 0x10104dc field public static final int endColor = 16843166; // 0x101019e - field public static final int endX = 16844051; // 0x1010513 - field public static final int endY = 16844052; // 0x1010514 + field public static final int endX = 16844052; // 0x1010514 + field public static final int endY = 16844053; // 0x1010515 field public static final deprecated int endYear = 16843133; // 0x101017d field public static final int enterFadeDuration = 16843532; // 0x101030c field public static final int entries = 16842930; // 0x10100b2 @@ -535,7 +535,7 @@ package android { field public static final int expandableListViewStyle = 16842863; // 0x101006f field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6 field public static final int exported = 16842768; // 0x1010010 - field public static final int externalService = 16844047; // 0x101050f + field public static final int externalService = 16844048; // 0x1010510 field public static final int extraTension = 16843371; // 0x101026b field public static final int extractNativeLibs = 16844010; // 0x10104ea field public static final int factor = 16843219; // 0x10101d3 @@ -560,7 +560,7 @@ package android { field public static final int fillBefore = 16843196; // 0x10101bc field public static final int fillColor = 16843780; // 0x1010404 field public static final int fillEnabled = 16843343; // 0x101024f - field public static final int fillType = 16844064; // 0x1010520 + field public static final int fillType = 16844065; // 0x1010521 field public static final int fillViewport = 16843130; // 0x101017a field public static final int filter = 16843035; // 0x101011b field public static final int filterTouchesWhenObscured = 16843460; // 0x10102c4 @@ -652,8 +652,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 - field public static final int hotSpotX = 16844056; // 0x1010518 - field public static final int hotSpotY = 16844057; // 0x1010519 + field public static final int hotSpotX = 16844057; // 0x1010519 + field public static final int hotSpotY = 16844058; // 0x101051a field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 @@ -740,7 +740,7 @@ package android { field public static final int label = 16842753; // 0x1010001 field public static final int labelFor = 16843718; // 0x10103c6 field public static final int labelTextSize = 16843317; // 0x1010235 - field public static final int languageTag = 16844041; // 0x1010509 + field public static final int languageTag = 16844042; // 0x101050a field public static final int largeHeap = 16843610; // 0x101035a field public static final int largeScreens = 16843398; // 0x1010286 field public static final int largestWidthLimitDp = 16843622; // 0x1010366 @@ -798,7 +798,7 @@ package android { field public static final int layout_y = 16843136; // 0x1010180 field public static final int left = 16843181; // 0x10101ad field public static final int letterSpacing = 16843958; // 0x10104b6 - field public static final int level = 16844033; // 0x1010501 + field public static final int level = 16844034; // 0x1010502 field public static final int lineSpacingExtra = 16843287; // 0x1010217 field public static final int lineSpacingMultiplier = 16843288; // 0x1010218 field public static final int lines = 16843092; // 0x1010154 @@ -831,7 +831,7 @@ package android { field public static final int marqueeRepeatLimit = 16843293; // 0x101021d field public static final int matchOrder = 16843855; // 0x101044f field public static final int max = 16843062; // 0x1010136 - field public static final int maxButtonHeight = 16844030; // 0x10104fe + field public static final int maxButtonHeight = 16844031; // 0x10104ff field public static final int maxDate = 16843584; // 0x1010340 field public static final int maxEms = 16843095; // 0x1010157 field public static final int maxHeight = 16843040; // 0x1010120 @@ -859,7 +859,8 @@ package android { field public static final int minResizeWidth = 16843669; // 0x1010395 field public static final int minSdkVersion = 16843276; // 0x101020c field public static final int minWidth = 16843071; // 0x101013f - field public static final int minimalSize = 16844022; // 0x10104f6 + field public static final int minimalHeight = 16844023; // 0x10104f7 + field public static final int minimalWidth = 16844022; // 0x10104f6 field public static final int minimumHorizontalAngle = 16843901; // 0x101047d field public static final int minimumVerticalAngle = 16843902; // 0x101047e field public static final int mipMap = 16843725; // 0x10103cd @@ -880,7 +881,7 @@ package android { field public static final int nextFocusLeft = 16842977; // 0x10100e1 field public static final int nextFocusRight = 16842978; // 0x10100e2 field public static final int nextFocusUp = 16842979; // 0x10100e3 - field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f + field public static final int nfcAntennaPositionDrawable = 16844064; // 0x1010520 field public static final int noHistory = 16843309; // 0x101022d field public static final int normalScreens = 16843397; // 0x1010285 field public static final int notificationTimeout = 16843651; // 0x1010383 @@ -892,7 +893,7 @@ package android { field public static final int numbersTextColor = 16843937; // 0x10104a1 field public static final deprecated int numeric = 16843109; // 0x1010165 field public static final int numericShortcut = 16843236; // 0x10101e4 - field public static final int offset = 16844053; // 0x1010515 + field public static final int offset = 16844054; // 0x1010516 field public static final int onClick = 16843375; // 0x101026f field public static final int oneshot = 16843159; // 0x1010197 field public static final int opacity = 16843550; // 0x101031e @@ -939,13 +940,13 @@ package android { field public static final deprecated int phoneNumber = 16843111; // 0x1010167 field public static final int pivotX = 16843189; // 0x10101b5 field public static final int pivotY = 16843190; // 0x10101b6 - field public static final int pointerShape = 16844042; // 0x101050a + field public static final int pointerShape = 16844043; // 0x101050b field public static final int popupAnimationStyle = 16843465; // 0x10102c9 field public static final int popupBackground = 16843126; // 0x1010176 field public static final int popupCharacters = 16843332; // 0x1010244 field public static final int popupElevation = 16843916; // 0x101048c - field public static final int popupEnterTransition = 16844065; // 0x1010521 - field public static final int popupExitTransition = 16844066; // 0x1010522 + field public static final int popupEnterTransition = 16844066; // 0x1010522 + field public static final int popupExitTransition = 16844067; // 0x1010523 field public static final int popupKeyboard = 16843331; // 0x1010243 field public static final int popupLayout = 16843323; // 0x101023b field public static final int popupMenuStyle = 16843520; // 0x1010300 @@ -954,7 +955,7 @@ package android { field public static final int port = 16842793; // 0x1010029 field public static final int positiveButtonText = 16843253; // 0x10101f5 field public static final int preferenceCategoryStyle = 16842892; // 0x101008c - field public static final int preferenceFragmentStyle = 16844039; // 0x1010507 + field public static final int preferenceFragmentStyle = 16844040; // 0x1010508 field public static final int preferenceInformationStyle = 16842893; // 0x101008d field public static final int preferenceLayoutChild = 16842900; // 0x1010094 field public static final int preferenceScreenStyle = 16842891; // 0x101008b @@ -1022,7 +1023,7 @@ package android { field public static final int resizeClip = 16843983; // 0x10104cf field public static final int resizeMode = 16843619; // 0x1010363 field public static final int resizeable = 16843405; // 0x101028d - field public static final int resizeableActivity = 16844023; // 0x10104f7 + field public static final int resizeableActivity = 16844024; // 0x10104f8 field public static final int resource = 16842789; // 0x1010025 field public static final int restoreAnyVersion = 16843450; // 0x10102ba field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d @@ -1142,8 +1143,8 @@ package android { field public static final int startColor = 16843165; // 0x101019d field public static final int startDelay = 16843746; // 0x10103e2 field public static final int startOffset = 16843198; // 0x10101be - field public static final int startX = 16844049; // 0x1010511 - field public static final int startY = 16844050; // 0x1010512 + field public static final int startX = 16844050; // 0x1010512 + field public static final int startY = 16844051; // 0x1010513 field public static final deprecated int startYear = 16843132; // 0x101017c field public static final int stateListAnimator = 16843848; // 0x1010448 field public static final int stateNotNeeded = 16842774; // 0x1010016 @@ -1200,8 +1201,8 @@ package android { field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportsAssist = 16844016; // 0x10104f0 field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1 - field public static final int supportsLocalInteraction = 16844048; // 0x1010510 - field public static final int supportsPictureInPicture = 16844024; // 0x10104f8 + field public static final int supportsLocalInteraction = 16844049; // 0x1010511 + field public static final int supportsPictureInPicture = 16844025; // 0x10104f9 field public static final int supportsRtl = 16843695; // 0x10103af field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb field public static final int supportsUploading = 16843419; // 0x101029b @@ -1250,7 +1251,7 @@ package android { field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f field public static final int textAppearanceMedium = 16842817; // 0x1010041 field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044 - field public static final int textAppearancePopupMenuHeader = 16844035; // 0x1010503 + field public static final int textAppearancePopupMenuHeader = 16844036; // 0x1010504 field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0 field public static final int textAppearanceSearchResultTitle = 16843425; // 0x10102a1 field public static final int textAppearanceSmall = 16842818; // 0x1010042 @@ -1308,9 +1309,9 @@ package android { field public static final int thumbTint = 16843889; // 0x1010471 field public static final int thumbTintMode = 16843890; // 0x1010472 field public static final int thumbnail = 16843429; // 0x10102a5 - field public static final int tickMark = 16844043; // 0x101050b - field public static final int tickMarkTint = 16844044; // 0x101050c - field public static final int tickMarkTintMode = 16844045; // 0x101050d + field public static final int tickMark = 16844044; // 0x101050c + field public static final int tickMarkTint = 16844045; // 0x101050d + field public static final int tickMarkTintMode = 16844046; // 0x101050e field public static final int tileMode = 16843265; // 0x1010201 field public static final int tileModeX = 16843895; // 0x1010477 field public static final int tileModeY = 16843896; // 0x1010478 @@ -1322,11 +1323,11 @@ package android { field public static final int tintMode = 16843771; // 0x10103fb field public static final int title = 16843233; // 0x10101e1 field public static final int titleCondensed = 16843234; // 0x10101e2 - field public static final int titleMargin = 16844025; // 0x10104f9 - field public static final int titleMarginBottom = 16844029; // 0x10104fd - field public static final int titleMarginEnd = 16844027; // 0x10104fb - field public static final int titleMarginStart = 16844026; // 0x10104fa - field public static final int titleMarginTop = 16844028; // 0x10104fc + field public static final int titleMargin = 16844026; // 0x10104fa + field public static final int titleMarginBottom = 16844030; // 0x10104fe + field public static final int titleMarginEnd = 16844028; // 0x10104fc + field public static final int titleMarginStart = 16844027; // 0x10104fb + field public static final int titleMarginTop = 16844029; // 0x10104fd field public static final int titleTextAppearance = 16843822; // 0x101042e field public static final int titleTextColor = 16844003; // 0x10104e3 field public static final int titleTextStyle = 16843512; // 0x10102f8 @@ -1365,7 +1366,7 @@ package android { field public static final int trimPathEnd = 16843785; // 0x1010409 field public static final int trimPathOffset = 16843786; // 0x101040a field public static final int trimPathStart = 16843784; // 0x1010408 - field public static final int tunerCount = 16844062; // 0x101051e + field public static final int tunerCount = 16844063; // 0x101051f field public static final int type = 16843169; // 0x10101a1 field public static final int typeface = 16842902; // 0x1010096 field public static final int uiOptions = 16843672; // 0x1010398 @@ -1373,7 +1374,7 @@ package android { field public static final deprecated int unfocusedMonthDateColor = 16843588; // 0x1010344 field public static final int unselectedAlpha = 16843278; // 0x101020e field public static final int updatePeriodMillis = 16843344; // 0x1010250 - field public static final int use32bitAbi = 16844054; // 0x1010516 + field public static final int use32bitAbi = 16844055; // 0x1010517 field public static final int useDefaultMargins = 16843641; // 0x1010379 field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310 field public static final int useLevel = 16843167; // 0x101019f @@ -1385,7 +1386,7 @@ package android { field public static final int valueType = 16843488; // 0x10102e0 field public static final int variablePadding = 16843157; // 0x1010195 field public static final int vendor = 16843751; // 0x10103e7 - field public static final int version = 16844058; // 0x101051a + field public static final int version = 16844059; // 0x101051b field public static final int versionCode = 16843291; // 0x101021b field public static final int versionName = 16843292; // 0x101021c field public static final int verticalCorrection = 16843322; // 0x101023a @@ -1429,7 +1430,7 @@ package android { field public static final int windowAllowReturnTransitionOverlap = 16843835; // 0x101043b field public static final int windowAnimationStyle = 16842926; // 0x10100ae field public static final int windowBackground = 16842836; // 0x1010054 - field public static final int windowBackgroundFallback = 16844036; // 0x1010504 + field public static final int windowBackgroundFallback = 16844037; // 0x1010505 field public static final int windowClipToOutline = 16843947; // 0x10104ab field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b field public static final int windowContentOverlay = 16842841; // 0x1010059 @@ -9257,7 +9258,6 @@ package android.content.pm { field public int documentLaunchMode; field public int flags; field public int launchMode; - field public android.content.pm.ActivityInfo.Layout layout; field public int maxRecents; field public java.lang.String parentActivityName; field public java.lang.String permission; @@ -9268,14 +9268,16 @@ package android.content.pm { field public java.lang.String taskAffinity; field public int theme; field public int uiOptions; + field public android.content.pm.ActivityInfo.WindowLayout windowLayout; } - public static final class ActivityInfo.Layout { - ctor public ActivityInfo.Layout(int, float, int, float, int, int); + public static final class ActivityInfo.WindowLayout { + ctor public ActivityInfo.WindowLayout(int, float, int, float, int, int, int); field public final int gravity; field public final int height; field public final float heightFraction; - field public final int minimalSize; + field public final int minimalHeight; + field public final int minimalWidth; field public final int width; field public final float widthFraction; } diff --git a/api/system-current.txt b/api/system-current.txt index 9da575b3bf261..13b6c24790015 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -396,13 +396,13 @@ package android { field public static final int backgroundTint = 16843883; // 0x101046b field public static final int backgroundTintMode = 16843884; // 0x101046c field public static final int backupAgent = 16843391; // 0x101027f - field public static final int backupInForeground = 16844059; // 0x101051b + field public static final int backupInForeground = 16844060; // 0x101051c field public static final int banner = 16843762; // 0x10103f2 field public static final int baseline = 16843548; // 0x101031c field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 - field public static final int bitmap = 16844055; // 0x1010517 + field public static final int bitmap = 16844056; // 0x1010518 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -421,7 +421,7 @@ package android { field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489 field public static final int buttonBarStyle = 16843566; // 0x101032e - field public static final int buttonGravity = 16844031; // 0x10104ff + field public static final int buttonGravity = 16844032; // 0x1010500 field public static final int buttonStyle = 16842824; // 0x1010048 field public static final int buttonStyleInset = 16842826; // 0x101004a field public static final int buttonStyleSmall = 16842825; // 0x1010049 @@ -432,9 +432,9 @@ package android { field public static final int calendarTextColor = 16843931; // 0x101049b field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d - field public static final int canControlMagnification = 16844040; // 0x1010508 - field public static final int canPerformGestures = 16844046; // 0x101050e - field public static final int canRecord = 16844061; // 0x101051d + field public static final int canControlMagnification = 16844041; // 0x1010509 + field public static final int canPerformGestures = 16844047; // 0x101050f + field public static final int canRecord = 16844062; // 0x101051e field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8 field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9 field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 @@ -474,7 +474,7 @@ package android { field public static final int codes = 16843330; // 0x1010242 field public static final int collapseColumns = 16843083; // 0x101014b field public static final int collapseContentDescription = 16843984; // 0x10104d0 - field public static final int collapseIcon = 16844032; // 0x1010500 + field public static final int collapseIcon = 16844033; // 0x1010501 field public static final int color = 16843173; // 0x10101a5 field public static final int colorAccent = 16843829; // 0x1010435 field public static final int colorActivatedHighlight = 16843664; // 0x1010390 @@ -515,12 +515,12 @@ package android { field public static final int contentInsetRight = 16843862; // 0x1010456 field public static final int contentInsetStart = 16843859; // 0x1010453 field public static final int contextClickable = 16844007; // 0x10104e7 - field public static final int contextPopupMenuStyle = 16844034; // 0x1010502 + field public static final int contextPopupMenuStyle = 16844035; // 0x1010503 field public static final int controlX1 = 16843772; // 0x10103fc field public static final int controlX2 = 16843774; // 0x10103fe field public static final int controlY1 = 16843773; // 0x10103fd field public static final int controlY2 = 16843775; // 0x10103ff - field public static final int countDown = 16844060; // 0x101051c + field public static final int countDown = 16844061; // 0x101051d field public static final int country = 16843962; // 0x10104ba field public static final int cropToPadding = 16843043; // 0x1010123 field public static final int cursorVisible = 16843090; // 0x1010152 @@ -538,7 +538,7 @@ package android { 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 defaultToDeviceProtectedStorage = 16844037; // 0x1010505 + field public static final int defaultToDeviceProtectedStorage = 16844038; // 0x1010506 field public static final int defaultValue = 16843245; // 0x10101ed field public static final int defaultWidth = 16844020; // 0x10104f4 field public static final int delay = 16843212; // 0x10101cc @@ -558,7 +558,7 @@ package android { field public static final int dialogTheme = 16843528; // 0x1010308 field public static final int dialogTitle = 16843250; // 0x10101f2 field public static final int digits = 16843110; // 0x1010166 - field public static final int directBootAware = 16844038; // 0x1010506 + field public static final int directBootAware = 16844039; // 0x1010507 field public static final int direction = 16843217; // 0x10101d1 field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1 field public static final int directionPriority = 16843218; // 0x10101d2 @@ -609,8 +609,8 @@ package android { field public static final int enabled = 16842766; // 0x101000e field public static final int end = 16843996; // 0x10104dc field public static final int endColor = 16843166; // 0x101019e - field public static final int endX = 16844051; // 0x1010513 - field public static final int endY = 16844052; // 0x1010514 + field public static final int endX = 16844052; // 0x1010514 + field public static final int endY = 16844053; // 0x1010515 field public static final deprecated int endYear = 16843133; // 0x101017d field public static final int enterFadeDuration = 16843532; // 0x101030c field public static final int entries = 16842930; // 0x10100b2 @@ -630,7 +630,7 @@ package android { field public static final int expandableListViewStyle = 16842863; // 0x101006f field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6 field public static final int exported = 16842768; // 0x1010010 - field public static final int externalService = 16844047; // 0x101050f + field public static final int externalService = 16844048; // 0x1010510 field public static final int extraTension = 16843371; // 0x101026b field public static final int extractNativeLibs = 16844010; // 0x10104ea field public static final int factor = 16843219; // 0x10101d3 @@ -655,7 +655,7 @@ package android { field public static final int fillBefore = 16843196; // 0x10101bc field public static final int fillColor = 16843780; // 0x1010404 field public static final int fillEnabled = 16843343; // 0x101024f - field public static final int fillType = 16844064; // 0x1010520 + field public static final int fillType = 16844065; // 0x1010521 field public static final int fillViewport = 16843130; // 0x101017a field public static final int filter = 16843035; // 0x101011b field public static final int filterTouchesWhenObscured = 16843460; // 0x10102c4 @@ -747,8 +747,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 - field public static final int hotSpotX = 16844056; // 0x1010518 - field public static final int hotSpotY = 16844057; // 0x1010519 + field public static final int hotSpotX = 16844057; // 0x1010519 + field public static final int hotSpotY = 16844058; // 0x101051a field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 @@ -835,7 +835,7 @@ package android { field public static final int label = 16842753; // 0x1010001 field public static final int labelFor = 16843718; // 0x10103c6 field public static final int labelTextSize = 16843317; // 0x1010235 - field public static final int languageTag = 16844041; // 0x1010509 + field public static final int languageTag = 16844042; // 0x101050a field public static final int largeHeap = 16843610; // 0x101035a field public static final int largeScreens = 16843398; // 0x1010286 field public static final int largestWidthLimitDp = 16843622; // 0x1010366 @@ -893,7 +893,7 @@ package android { field public static final int layout_y = 16843136; // 0x1010180 field public static final int left = 16843181; // 0x10101ad field public static final int letterSpacing = 16843958; // 0x10104b6 - field public static final int level = 16844033; // 0x1010501 + field public static final int level = 16844034; // 0x1010502 field public static final int lineSpacingExtra = 16843287; // 0x1010217 field public static final int lineSpacingMultiplier = 16843288; // 0x1010218 field public static final int lines = 16843092; // 0x1010154 @@ -926,7 +926,7 @@ package android { field public static final int marqueeRepeatLimit = 16843293; // 0x101021d field public static final int matchOrder = 16843855; // 0x101044f field public static final int max = 16843062; // 0x1010136 - field public static final int maxButtonHeight = 16844030; // 0x10104fe + field public static final int maxButtonHeight = 16844031; // 0x10104ff field public static final int maxDate = 16843584; // 0x1010340 field public static final int maxEms = 16843095; // 0x1010157 field public static final int maxHeight = 16843040; // 0x1010120 @@ -954,7 +954,8 @@ package android { field public static final int minResizeWidth = 16843669; // 0x1010395 field public static final int minSdkVersion = 16843276; // 0x101020c field public static final int minWidth = 16843071; // 0x101013f - field public static final int minimalSize = 16844022; // 0x10104f6 + field public static final int minimalHeight = 16844023; // 0x10104f7 + field public static final int minimalWidth = 16844022; // 0x10104f6 field public static final int minimumHorizontalAngle = 16843901; // 0x101047d field public static final int minimumVerticalAngle = 16843902; // 0x101047e field public static final int mipMap = 16843725; // 0x10103cd @@ -975,7 +976,7 @@ package android { field public static final int nextFocusLeft = 16842977; // 0x10100e1 field public static final int nextFocusRight = 16842978; // 0x10100e2 field public static final int nextFocusUp = 16842979; // 0x10100e3 - field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f + field public static final int nfcAntennaPositionDrawable = 16844064; // 0x1010520 field public static final int noHistory = 16843309; // 0x101022d field public static final int normalScreens = 16843397; // 0x1010285 field public static final int notificationTimeout = 16843651; // 0x1010383 @@ -987,7 +988,7 @@ package android { field public static final int numbersTextColor = 16843937; // 0x10104a1 field public static final deprecated int numeric = 16843109; // 0x1010165 field public static final int numericShortcut = 16843236; // 0x10101e4 - field public static final int offset = 16844053; // 0x1010515 + field public static final int offset = 16844054; // 0x1010516 field public static final int onClick = 16843375; // 0x101026f field public static final int oneshot = 16843159; // 0x1010197 field public static final int opacity = 16843550; // 0x101031e @@ -1034,13 +1035,13 @@ package android { field public static final deprecated int phoneNumber = 16843111; // 0x1010167 field public static final int pivotX = 16843189; // 0x10101b5 field public static final int pivotY = 16843190; // 0x10101b6 - field public static final int pointerShape = 16844042; // 0x101050a + field public static final int pointerShape = 16844043; // 0x101050b field public static final int popupAnimationStyle = 16843465; // 0x10102c9 field public static final int popupBackground = 16843126; // 0x1010176 field public static final int popupCharacters = 16843332; // 0x1010244 field public static final int popupElevation = 16843916; // 0x101048c - field public static final int popupEnterTransition = 16844065; // 0x1010521 - field public static final int popupExitTransition = 16844066; // 0x1010522 + field public static final int popupEnterTransition = 16844066; // 0x1010522 + field public static final int popupExitTransition = 16844067; // 0x1010523 field public static final int popupKeyboard = 16843331; // 0x1010243 field public static final int popupLayout = 16843323; // 0x101023b field public static final int popupMenuStyle = 16843520; // 0x1010300 @@ -1049,7 +1050,7 @@ package android { field public static final int port = 16842793; // 0x1010029 field public static final int positiveButtonText = 16843253; // 0x10101f5 field public static final int preferenceCategoryStyle = 16842892; // 0x101008c - field public static final int preferenceFragmentStyle = 16844039; // 0x1010507 + field public static final int preferenceFragmentStyle = 16844040; // 0x1010508 field public static final int preferenceInformationStyle = 16842893; // 0x101008d field public static final int preferenceLayoutChild = 16842900; // 0x1010094 field public static final int preferenceScreenStyle = 16842891; // 0x101008b @@ -1117,7 +1118,7 @@ package android { field public static final int resizeClip = 16843983; // 0x10104cf field public static final int resizeMode = 16843619; // 0x1010363 field public static final int resizeable = 16843405; // 0x101028d - field public static final int resizeableActivity = 16844023; // 0x10104f7 + field public static final int resizeableActivity = 16844024; // 0x10104f8 field public static final int resource = 16842789; // 0x1010025 field public static final int restoreAnyVersion = 16843450; // 0x10102ba field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d @@ -1241,8 +1242,8 @@ package android { field public static final int startColor = 16843165; // 0x101019d field public static final int startDelay = 16843746; // 0x10103e2 field public static final int startOffset = 16843198; // 0x10101be - field public static final int startX = 16844049; // 0x1010511 - field public static final int startY = 16844050; // 0x1010512 + field public static final int startX = 16844050; // 0x1010512 + field public static final int startY = 16844051; // 0x1010513 field public static final deprecated int startYear = 16843132; // 0x101017c field public static final int stateListAnimator = 16843848; // 0x1010448 field public static final int stateNotNeeded = 16842774; // 0x1010016 @@ -1299,8 +1300,8 @@ package android { field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportsAssist = 16844016; // 0x10104f0 field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1 - field public static final int supportsLocalInteraction = 16844048; // 0x1010510 - field public static final int supportsPictureInPicture = 16844024; // 0x10104f8 + field public static final int supportsLocalInteraction = 16844049; // 0x1010511 + field public static final int supportsPictureInPicture = 16844025; // 0x10104f9 field public static final int supportsRtl = 16843695; // 0x10103af field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb field public static final int supportsUploading = 16843419; // 0x101029b @@ -1349,7 +1350,7 @@ package android { field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f field public static final int textAppearanceMedium = 16842817; // 0x1010041 field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044 - field public static final int textAppearancePopupMenuHeader = 16844035; // 0x1010503 + field public static final int textAppearancePopupMenuHeader = 16844036; // 0x1010504 field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0 field public static final int textAppearanceSearchResultTitle = 16843425; // 0x10102a1 field public static final int textAppearanceSmall = 16842818; // 0x1010042 @@ -1407,9 +1408,9 @@ package android { field public static final int thumbTint = 16843889; // 0x1010471 field public static final int thumbTintMode = 16843890; // 0x1010472 field public static final int thumbnail = 16843429; // 0x10102a5 - field public static final int tickMark = 16844043; // 0x101050b - field public static final int tickMarkTint = 16844044; // 0x101050c - field public static final int tickMarkTintMode = 16844045; // 0x101050d + field public static final int tickMark = 16844044; // 0x101050c + field public static final int tickMarkTint = 16844045; // 0x101050d + field public static final int tickMarkTintMode = 16844046; // 0x101050e field public static final int tileMode = 16843265; // 0x1010201 field public static final int tileModeX = 16843895; // 0x1010477 field public static final int tileModeY = 16843896; // 0x1010478 @@ -1421,11 +1422,11 @@ package android { field public static final int tintMode = 16843771; // 0x10103fb field public static final int title = 16843233; // 0x10101e1 field public static final int titleCondensed = 16843234; // 0x10101e2 - field public static final int titleMargin = 16844025; // 0x10104f9 - field public static final int titleMarginBottom = 16844029; // 0x10104fd - field public static final int titleMarginEnd = 16844027; // 0x10104fb - field public static final int titleMarginStart = 16844026; // 0x10104fa - field public static final int titleMarginTop = 16844028; // 0x10104fc + field public static final int titleMargin = 16844026; // 0x10104fa + field public static final int titleMarginBottom = 16844030; // 0x10104fe + field public static final int titleMarginEnd = 16844028; // 0x10104fc + field public static final int titleMarginStart = 16844027; // 0x10104fb + field public static final int titleMarginTop = 16844029; // 0x10104fd field public static final int titleTextAppearance = 16843822; // 0x101042e field public static final int titleTextColor = 16844003; // 0x10104e3 field public static final int titleTextStyle = 16843512; // 0x10102f8 @@ -1464,7 +1465,7 @@ package android { field public static final int trimPathEnd = 16843785; // 0x1010409 field public static final int trimPathOffset = 16843786; // 0x101040a field public static final int trimPathStart = 16843784; // 0x1010408 - field public static final int tunerCount = 16844062; // 0x101051e + field public static final int tunerCount = 16844063; // 0x101051f field public static final int type = 16843169; // 0x10101a1 field public static final int typeface = 16842902; // 0x1010096 field public static final int uiOptions = 16843672; // 0x1010398 @@ -1472,7 +1473,7 @@ package android { field public static final deprecated int unfocusedMonthDateColor = 16843588; // 0x1010344 field public static final int unselectedAlpha = 16843278; // 0x101020e field public static final int updatePeriodMillis = 16843344; // 0x1010250 - field public static final int use32bitAbi = 16844054; // 0x1010516 + field public static final int use32bitAbi = 16844055; // 0x1010517 field public static final int useDefaultMargins = 16843641; // 0x1010379 field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310 field public static final int useLevel = 16843167; // 0x101019f @@ -1484,7 +1485,7 @@ package android { field public static final int valueType = 16843488; // 0x10102e0 field public static final int variablePadding = 16843157; // 0x1010195 field public static final int vendor = 16843751; // 0x10103e7 - field public static final int version = 16844058; // 0x101051a + field public static final int version = 16844059; // 0x101051b field public static final int versionCode = 16843291; // 0x101021b field public static final int versionName = 16843292; // 0x101021c field public static final int verticalCorrection = 16843322; // 0x101023a @@ -1528,7 +1529,7 @@ package android { field public static final int windowAllowReturnTransitionOverlap = 16843835; // 0x101043b field public static final int windowAnimationStyle = 16842926; // 0x10100ae field public static final int windowBackground = 16842836; // 0x1010054 - field public static final int windowBackgroundFallback = 16844036; // 0x1010504 + field public static final int windowBackgroundFallback = 16844037; // 0x1010505 field public static final int windowClipToOutline = 16843947; // 0x10104ab field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b field public static final int windowContentOverlay = 16842841; // 0x1010059 @@ -9580,7 +9581,6 @@ package android.content.pm { field public int documentLaunchMode; field public int flags; field public int launchMode; - field public android.content.pm.ActivityInfo.Layout layout; field public int maxRecents; field public java.lang.String parentActivityName; field public java.lang.String permission; @@ -9591,14 +9591,16 @@ package android.content.pm { field public java.lang.String taskAffinity; field public int theme; field public int uiOptions; + field public android.content.pm.ActivityInfo.WindowLayout windowLayout; } - public static final class ActivityInfo.Layout { - ctor public ActivityInfo.Layout(int, float, int, float, int, int); + public static final class ActivityInfo.WindowLayout { + ctor public ActivityInfo.WindowLayout(int, float, int, float, int, int, int); field public final int gravity; field public final int height; field public final float heightFraction; - field public final int minimalSize; + field public final int minimalHeight; + field public final int minimalWidth; field public final int width; field public final float widthFraction; } diff --git a/api/test-current.txt b/api/test-current.txt index 78e9618d5518f..15fb31dd53171 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -301,13 +301,13 @@ package android { field public static final int backgroundTint = 16843883; // 0x101046b field public static final int backgroundTintMode = 16843884; // 0x101046c field public static final int backupAgent = 16843391; // 0x101027f - field public static final int backupInForeground = 16844059; // 0x101051b + field public static final int backupInForeground = 16844060; // 0x101051c field public static final int banner = 16843762; // 0x10103f2 field public static final int baseline = 16843548; // 0x101031c field public static final int baselineAlignBottom = 16843042; // 0x1010122 field public static final int baselineAligned = 16843046; // 0x1010126 field public static final int baselineAlignedChildIndex = 16843047; // 0x1010127 - field public static final int bitmap = 16844055; // 0x1010517 + field public static final int bitmap = 16844056; // 0x1010518 field public static final int borderlessButtonStyle = 16843563; // 0x101032b field public static final int bottom = 16843184; // 0x10101b0 field public static final int bottomBright = 16842957; // 0x10100cd @@ -326,7 +326,7 @@ package android { field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489 field public static final int buttonBarStyle = 16843566; // 0x101032e - field public static final int buttonGravity = 16844031; // 0x10104ff + field public static final int buttonGravity = 16844032; // 0x1010500 field public static final int buttonStyle = 16842824; // 0x1010048 field public static final int buttonStyleInset = 16842826; // 0x101004a field public static final int buttonStyleSmall = 16842825; // 0x1010049 @@ -337,9 +337,9 @@ package android { field public static final int calendarTextColor = 16843931; // 0x101049b field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d - field public static final int canControlMagnification = 16844040; // 0x1010508 - field public static final int canPerformGestures = 16844046; // 0x101050e - field public static final int canRecord = 16844061; // 0x101051d + field public static final int canControlMagnification = 16844041; // 0x1010509 + field public static final int canPerformGestures = 16844047; // 0x101050f + field public static final int canRecord = 16844062; // 0x101051e field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8 field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9 field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 @@ -379,7 +379,7 @@ package android { field public static final int codes = 16843330; // 0x1010242 field public static final int collapseColumns = 16843083; // 0x101014b field public static final int collapseContentDescription = 16843984; // 0x10104d0 - field public static final int collapseIcon = 16844032; // 0x1010500 + field public static final int collapseIcon = 16844033; // 0x1010501 field public static final int color = 16843173; // 0x10101a5 field public static final int colorAccent = 16843829; // 0x1010435 field public static final int colorActivatedHighlight = 16843664; // 0x1010390 @@ -420,12 +420,12 @@ package android { field public static final int contentInsetRight = 16843862; // 0x1010456 field public static final int contentInsetStart = 16843859; // 0x1010453 field public static final int contextClickable = 16844007; // 0x10104e7 - field public static final int contextPopupMenuStyle = 16844034; // 0x1010502 + field public static final int contextPopupMenuStyle = 16844035; // 0x1010503 field public static final int controlX1 = 16843772; // 0x10103fc field public static final int controlX2 = 16843774; // 0x10103fe field public static final int controlY1 = 16843773; // 0x10103fd field public static final int controlY2 = 16843775; // 0x10103ff - field public static final int countDown = 16844060; // 0x101051c + field public static final int countDown = 16844061; // 0x101051d field public static final int country = 16843962; // 0x10104ba field public static final int cropToPadding = 16843043; // 0x1010123 field public static final int cursorVisible = 16843090; // 0x1010152 @@ -443,7 +443,7 @@ package android { 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 defaultToDeviceProtectedStorage = 16844037; // 0x1010505 + field public static final int defaultToDeviceProtectedStorage = 16844038; // 0x1010506 field public static final int defaultValue = 16843245; // 0x10101ed field public static final int defaultWidth = 16844020; // 0x10104f4 field public static final int delay = 16843212; // 0x10101cc @@ -463,7 +463,7 @@ package android { field public static final int dialogTheme = 16843528; // 0x1010308 field public static final int dialogTitle = 16843250; // 0x10101f2 field public static final int digits = 16843110; // 0x1010166 - field public static final int directBootAware = 16844038; // 0x1010506 + field public static final int directBootAware = 16844039; // 0x1010507 field public static final int direction = 16843217; // 0x10101d1 field public static final deprecated int directionDescriptions = 16843681; // 0x10103a1 field public static final int directionPriority = 16843218; // 0x10101d2 @@ -514,8 +514,8 @@ package android { field public static final int enabled = 16842766; // 0x101000e field public static final int end = 16843996; // 0x10104dc field public static final int endColor = 16843166; // 0x101019e - field public static final int endX = 16844051; // 0x1010513 - field public static final int endY = 16844052; // 0x1010514 + field public static final int endX = 16844052; // 0x1010514 + field public static final int endY = 16844053; // 0x1010515 field public static final deprecated int endYear = 16843133; // 0x101017d field public static final int enterFadeDuration = 16843532; // 0x101030c field public static final int entries = 16842930; // 0x10100b2 @@ -535,7 +535,7 @@ package android { field public static final int expandableListViewStyle = 16842863; // 0x101006f field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6 field public static final int exported = 16842768; // 0x1010010 - field public static final int externalService = 16844047; // 0x101050f + field public static final int externalService = 16844048; // 0x1010510 field public static final int extraTension = 16843371; // 0x101026b field public static final int extractNativeLibs = 16844010; // 0x10104ea field public static final int factor = 16843219; // 0x10101d3 @@ -560,7 +560,7 @@ package android { field public static final int fillBefore = 16843196; // 0x10101bc field public static final int fillColor = 16843780; // 0x1010404 field public static final int fillEnabled = 16843343; // 0x101024f - field public static final int fillType = 16844064; // 0x1010520 + field public static final int fillType = 16844065; // 0x1010521 field public static final int fillViewport = 16843130; // 0x101017a field public static final int filter = 16843035; // 0x101011b field public static final int filterTouchesWhenObscured = 16843460; // 0x10102c4 @@ -652,8 +652,8 @@ package android { field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353 field public static final int horizontalSpacing = 16843028; // 0x1010114 field public static final int host = 16842792; // 0x1010028 - field public static final int hotSpotX = 16844056; // 0x1010518 - field public static final int hotSpotY = 16844057; // 0x1010519 + field public static final int hotSpotX = 16844057; // 0x1010519 + field public static final int hotSpotY = 16844058; // 0x101051a field public static final int hyphenationFrequency = 16843998; // 0x10104de field public static final int icon = 16842754; // 0x1010002 field public static final int iconPreview = 16843337; // 0x1010249 @@ -740,7 +740,7 @@ package android { field public static final int label = 16842753; // 0x1010001 field public static final int labelFor = 16843718; // 0x10103c6 field public static final int labelTextSize = 16843317; // 0x1010235 - field public static final int languageTag = 16844041; // 0x1010509 + field public static final int languageTag = 16844042; // 0x101050a field public static final int largeHeap = 16843610; // 0x101035a field public static final int largeScreens = 16843398; // 0x1010286 field public static final int largestWidthLimitDp = 16843622; // 0x1010366 @@ -798,7 +798,7 @@ package android { field public static final int layout_y = 16843136; // 0x1010180 field public static final int left = 16843181; // 0x10101ad field public static final int letterSpacing = 16843958; // 0x10104b6 - field public static final int level = 16844033; // 0x1010501 + field public static final int level = 16844034; // 0x1010502 field public static final int lineSpacingExtra = 16843287; // 0x1010217 field public static final int lineSpacingMultiplier = 16843288; // 0x1010218 field public static final int lines = 16843092; // 0x1010154 @@ -831,7 +831,7 @@ package android { field public static final int marqueeRepeatLimit = 16843293; // 0x101021d field public static final int matchOrder = 16843855; // 0x101044f field public static final int max = 16843062; // 0x1010136 - field public static final int maxButtonHeight = 16844030; // 0x10104fe + field public static final int maxButtonHeight = 16844031; // 0x10104ff field public static final int maxDate = 16843584; // 0x1010340 field public static final int maxEms = 16843095; // 0x1010157 field public static final int maxHeight = 16843040; // 0x1010120 @@ -859,7 +859,8 @@ package android { field public static final int minResizeWidth = 16843669; // 0x1010395 field public static final int minSdkVersion = 16843276; // 0x101020c field public static final int minWidth = 16843071; // 0x101013f - field public static final int minimalSize = 16844022; // 0x10104f6 + field public static final int minimalHeight = 16844023; // 0x10104f7 + field public static final int minimalWidth = 16844022; // 0x10104f6 field public static final int minimumHorizontalAngle = 16843901; // 0x101047d field public static final int minimumVerticalAngle = 16843902; // 0x101047e field public static final int mipMap = 16843725; // 0x10103cd @@ -880,7 +881,7 @@ package android { field public static final int nextFocusLeft = 16842977; // 0x10100e1 field public static final int nextFocusRight = 16842978; // 0x10100e2 field public static final int nextFocusUp = 16842979; // 0x10100e3 - field public static final int nfcAntennaPositionDrawable = 16844063; // 0x101051f + field public static final int nfcAntennaPositionDrawable = 16844064; // 0x1010520 field public static final int noHistory = 16843309; // 0x101022d field public static final int normalScreens = 16843397; // 0x1010285 field public static final int notificationTimeout = 16843651; // 0x1010383 @@ -892,7 +893,7 @@ package android { field public static final int numbersTextColor = 16843937; // 0x10104a1 field public static final deprecated int numeric = 16843109; // 0x1010165 field public static final int numericShortcut = 16843236; // 0x10101e4 - field public static final int offset = 16844053; // 0x1010515 + field public static final int offset = 16844054; // 0x1010516 field public static final int onClick = 16843375; // 0x101026f field public static final int oneshot = 16843159; // 0x1010197 field public static final int opacity = 16843550; // 0x101031e @@ -939,13 +940,13 @@ package android { field public static final deprecated int phoneNumber = 16843111; // 0x1010167 field public static final int pivotX = 16843189; // 0x10101b5 field public static final int pivotY = 16843190; // 0x10101b6 - field public static final int pointerShape = 16844042; // 0x101050a + field public static final int pointerShape = 16844043; // 0x101050b field public static final int popupAnimationStyle = 16843465; // 0x10102c9 field public static final int popupBackground = 16843126; // 0x1010176 field public static final int popupCharacters = 16843332; // 0x1010244 field public static final int popupElevation = 16843916; // 0x101048c - field public static final int popupEnterTransition = 16844065; // 0x1010521 - field public static final int popupExitTransition = 16844066; // 0x1010522 + field public static final int popupEnterTransition = 16844066; // 0x1010522 + field public static final int popupExitTransition = 16844067; // 0x1010523 field public static final int popupKeyboard = 16843331; // 0x1010243 field public static final int popupLayout = 16843323; // 0x101023b field public static final int popupMenuStyle = 16843520; // 0x1010300 @@ -954,7 +955,7 @@ package android { field public static final int port = 16842793; // 0x1010029 field public static final int positiveButtonText = 16843253; // 0x10101f5 field public static final int preferenceCategoryStyle = 16842892; // 0x101008c - field public static final int preferenceFragmentStyle = 16844039; // 0x1010507 + field public static final int preferenceFragmentStyle = 16844040; // 0x1010508 field public static final int preferenceInformationStyle = 16842893; // 0x101008d field public static final int preferenceLayoutChild = 16842900; // 0x1010094 field public static final int preferenceScreenStyle = 16842891; // 0x101008b @@ -1022,7 +1023,7 @@ package android { field public static final int resizeClip = 16843983; // 0x10104cf field public static final int resizeMode = 16843619; // 0x1010363 field public static final int resizeable = 16843405; // 0x101028d - field public static final int resizeableActivity = 16844023; // 0x10104f7 + field public static final int resizeableActivity = 16844024; // 0x10104f8 field public static final int resource = 16842789; // 0x1010025 field public static final int restoreAnyVersion = 16843450; // 0x10102ba field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d @@ -1142,8 +1143,8 @@ package android { field public static final int startColor = 16843165; // 0x101019d field public static final int startDelay = 16843746; // 0x10103e2 field public static final int startOffset = 16843198; // 0x10101be - field public static final int startX = 16844049; // 0x1010511 - field public static final int startY = 16844050; // 0x1010512 + field public static final int startX = 16844050; // 0x1010512 + field public static final int startY = 16844051; // 0x1010513 field public static final deprecated int startYear = 16843132; // 0x101017c field public static final int stateListAnimator = 16843848; // 0x1010448 field public static final int stateNotNeeded = 16842774; // 0x1010016 @@ -1200,8 +1201,8 @@ package android { field public static final int summaryOn = 16843247; // 0x10101ef field public static final int supportsAssist = 16844016; // 0x10104f0 field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1 - field public static final int supportsLocalInteraction = 16844048; // 0x1010510 - field public static final int supportsPictureInPicture = 16844024; // 0x10104f8 + field public static final int supportsLocalInteraction = 16844049; // 0x1010511 + field public static final int supportsPictureInPicture = 16844025; // 0x10104f9 field public static final int supportsRtl = 16843695; // 0x10103af field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb field public static final int supportsUploading = 16843419; // 0x101029b @@ -1250,7 +1251,7 @@ package android { field public static final int textAppearanceListItemSmall = 16843679; // 0x101039f field public static final int textAppearanceMedium = 16842817; // 0x1010041 field public static final int textAppearanceMediumInverse = 16842820; // 0x1010044 - field public static final int textAppearancePopupMenuHeader = 16844035; // 0x1010503 + field public static final int textAppearancePopupMenuHeader = 16844036; // 0x1010504 field public static final int textAppearanceSearchResultSubtitle = 16843424; // 0x10102a0 field public static final int textAppearanceSearchResultTitle = 16843425; // 0x10102a1 field public static final int textAppearanceSmall = 16842818; // 0x1010042 @@ -1308,9 +1309,9 @@ package android { field public static final int thumbTint = 16843889; // 0x1010471 field public static final int thumbTintMode = 16843890; // 0x1010472 field public static final int thumbnail = 16843429; // 0x10102a5 - field public static final int tickMark = 16844043; // 0x101050b - field public static final int tickMarkTint = 16844044; // 0x101050c - field public static final int tickMarkTintMode = 16844045; // 0x101050d + field public static final int tickMark = 16844044; // 0x101050c + field public static final int tickMarkTint = 16844045; // 0x101050d + field public static final int tickMarkTintMode = 16844046; // 0x101050e field public static final int tileMode = 16843265; // 0x1010201 field public static final int tileModeX = 16843895; // 0x1010477 field public static final int tileModeY = 16843896; // 0x1010478 @@ -1322,11 +1323,11 @@ package android { field public static final int tintMode = 16843771; // 0x10103fb field public static final int title = 16843233; // 0x10101e1 field public static final int titleCondensed = 16843234; // 0x10101e2 - field public static final int titleMargin = 16844025; // 0x10104f9 - field public static final int titleMarginBottom = 16844029; // 0x10104fd - field public static final int titleMarginEnd = 16844027; // 0x10104fb - field public static final int titleMarginStart = 16844026; // 0x10104fa - field public static final int titleMarginTop = 16844028; // 0x10104fc + field public static final int titleMargin = 16844026; // 0x10104fa + field public static final int titleMarginBottom = 16844030; // 0x10104fe + field public static final int titleMarginEnd = 16844028; // 0x10104fc + field public static final int titleMarginStart = 16844027; // 0x10104fb + field public static final int titleMarginTop = 16844029; // 0x10104fd field public static final int titleTextAppearance = 16843822; // 0x101042e field public static final int titleTextColor = 16844003; // 0x10104e3 field public static final int titleTextStyle = 16843512; // 0x10102f8 @@ -1365,7 +1366,7 @@ package android { field public static final int trimPathEnd = 16843785; // 0x1010409 field public static final int trimPathOffset = 16843786; // 0x101040a field public static final int trimPathStart = 16843784; // 0x1010408 - field public static final int tunerCount = 16844062; // 0x101051e + field public static final int tunerCount = 16844063; // 0x101051f field public static final int type = 16843169; // 0x10101a1 field public static final int typeface = 16842902; // 0x1010096 field public static final int uiOptions = 16843672; // 0x1010398 @@ -1373,7 +1374,7 @@ package android { field public static final deprecated int unfocusedMonthDateColor = 16843588; // 0x1010344 field public static final int unselectedAlpha = 16843278; // 0x101020e field public static final int updatePeriodMillis = 16843344; // 0x1010250 - field public static final int use32bitAbi = 16844054; // 0x1010516 + field public static final int use32bitAbi = 16844055; // 0x1010517 field public static final int useDefaultMargins = 16843641; // 0x1010379 field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310 field public static final int useLevel = 16843167; // 0x101019f @@ -1385,7 +1386,7 @@ package android { field public static final int valueType = 16843488; // 0x10102e0 field public static final int variablePadding = 16843157; // 0x1010195 field public static final int vendor = 16843751; // 0x10103e7 - field public static final int version = 16844058; // 0x101051a + field public static final int version = 16844059; // 0x101051b field public static final int versionCode = 16843291; // 0x101021b field public static final int versionName = 16843292; // 0x101021c field public static final int verticalCorrection = 16843322; // 0x101023a @@ -1429,7 +1430,7 @@ package android { field public static final int windowAllowReturnTransitionOverlap = 16843835; // 0x101043b field public static final int windowAnimationStyle = 16842926; // 0x10100ae field public static final int windowBackground = 16842836; // 0x1010054 - field public static final int windowBackgroundFallback = 16844036; // 0x1010504 + field public static final int windowBackgroundFallback = 16844037; // 0x1010505 field public static final int windowClipToOutline = 16843947; // 0x10104ab field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b field public static final int windowContentOverlay = 16842841; // 0x1010059 @@ -9264,7 +9265,6 @@ package android.content.pm { field public int documentLaunchMode; field public int flags; field public int launchMode; - field public android.content.pm.ActivityInfo.Layout layout; field public int maxRecents; field public java.lang.String parentActivityName; field public java.lang.String permission; @@ -9275,14 +9275,16 @@ package android.content.pm { field public java.lang.String taskAffinity; field public int theme; field public int uiOptions; + field public android.content.pm.ActivityInfo.WindowLayout windowLayout; } - public static final class ActivityInfo.Layout { - ctor public ActivityInfo.Layout(int, float, int, float, int, int); + public static final class ActivityInfo.WindowLayout { + ctor public ActivityInfo.WindowLayout(int, float, int, float, int, int, int); field public final int gravity; field public final int height; field public final float heightFraction; - field public final int minimalSize; + field public final int minimalHeight; + field public final int minimalWidth; field public final int width; field public final float widthFraction; } diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index 5da3c866077a4..0f4cbbba707b1 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -767,7 +767,11 @@ public class ActivityInfo extends ComponentInfo */ public int lockTaskLaunchMode; - public Layout layout; + /** + * Information about desired position and size of activity on the display when + * it is first started. + */ + public WindowLayout windowLayout; public ActivityInfo() { } @@ -788,7 +792,7 @@ public class ActivityInfo extends ComponentInfo parentActivityName = orig.parentActivityName; maxRecents = orig.maxRecents; lockTaskLaunchMode = orig.lockTaskLaunchMode; - layout = orig.layout; + windowLayout = orig.windowLayout; resizeMode = orig.resizeMode; } @@ -886,10 +890,10 @@ public class ActivityInfo extends ComponentInfo pw.println(prefix + "lockTaskLaunchMode=" + lockTaskLaunchModeToString(lockTaskLaunchMode)); } - if (layout != null) { - pw.println(prefix + "defaultLayout=" + layout.width + "|" - + layout.widthFraction + ", " + layout.height + "|" - + layout.heightFraction + ", " + layout.gravity); + if (windowLayout != null) { + pw.println(prefix + "windowLayout=" + windowLayout.width + "|" + + windowLayout.widthFraction + ", " + windowLayout.height + "|" + + windowLayout.heightFraction + ", " + windowLayout.gravity); } pw.println(prefix + "resizeMode=" + resizeModeToString(resizeMode)); super.dumpBack(pw, prefix, flags); @@ -922,14 +926,15 @@ public class ActivityInfo extends ComponentInfo dest.writeInt(persistableMode); dest.writeInt(maxRecents); dest.writeInt(lockTaskLaunchMode); - if (layout != null) { + if (windowLayout != null) { dest.writeInt(1); - dest.writeInt(layout.width); - dest.writeFloat(layout.widthFraction); - dest.writeInt(layout.height); - dest.writeFloat(layout.heightFraction); - dest.writeInt(layout.gravity); - dest.writeInt(layout.minimalSize); + dest.writeInt(windowLayout.width); + dest.writeFloat(windowLayout.widthFraction); + dest.writeInt(windowLayout.height); + dest.writeFloat(windowLayout.heightFraction); + dest.writeInt(windowLayout.gravity); + dest.writeInt(windowLayout.minimalWidth); + dest.writeInt(windowLayout.minimalHeight); } else { dest.writeInt(0); } @@ -964,36 +969,107 @@ public class ActivityInfo extends ComponentInfo maxRecents = source.readInt(); lockTaskLaunchMode = source.readInt(); if (source.readInt() == 1) { - layout = new Layout(source); + windowLayout = new WindowLayout(source); } resizeMode = source.readInt(); } - public static final class Layout { - public Layout(int width, float widthFraction, int height, float heightFraction, int gravity, - int minimalSize) { + /** + * Contains information about position and size of the activity on the display. + * + * Used in freeform mode to set desired position when activity is first launched. + * It describes how big the activity wants to be in both width and height, + * the minimal allowed size, and the gravity to be applied. + * + * @attr ref android.R.styleable#AndroidManifestLayout_defaultWidth + * @attr ref android.R.styleable#AndroidManifestLayout_defaultHeight + * @attr ref android.R.styleable#AndroidManifestLayout_gravity + * @attr ref android.R.styleable#AndroidManifestLayout_minimalWidth + * @attr ref android.R.styleable#AndroidManifestLayout_minimalHeight + */ + public static final class WindowLayout { + public WindowLayout(int width, float widthFraction, int height, float heightFraction, int gravity, + int minimalWidth, int minimalHeight) { this.width = width; this.widthFraction = widthFraction; this.height = height; this.heightFraction = heightFraction; this.gravity = gravity; - this.minimalSize = minimalSize; + this.minimalWidth = minimalWidth; + this.minimalHeight = minimalHeight; } - Layout(Parcel source) { + WindowLayout(Parcel source) { width = source.readInt(); widthFraction = source.readFloat(); height = source.readInt(); heightFraction = source.readFloat(); gravity = source.readInt(); - minimalSize = source.readInt(); + minimalWidth = source.readInt(); + minimalHeight = source.readInt(); } + /** + * Width of activity in pixels. + * + * @attr ref android.R.styleable#AndroidManifestLayout_defaultWidth + */ public final int width; + + /** + * Width of activity as a fraction of available display width. + * If both {@link #width} and this value are set this one will be preferred. + * + * @attr ref android.R.styleable#AndroidManifestLayout_defaultWidth + */ public final float widthFraction; + + /** + * Height of activity in pixels. + * + * @attr ref android.R.styleable#AndroidManifestLayout_defaultHeight + */ public final int height; + + /** + * Height of activity as a fraction of available display height. + * If both {@link #height} and this value are set this one will be preferred. + * + * @attr ref android.R.styleable#AndroidManifestLayout_defaultHeight + */ public final float heightFraction; + + /** + * Gravity of activity. + * Currently {@link android.view.Gravity#TOP}, {@link android.view.Gravity#BOTTOM}, + * {@link android.view.Gravity#LEFT} and {@link android.view.Gravity#RIGHT} are supported. + * + * @attr ref android.R.styleable#AndroidManifestLayout_gravity + */ public final int gravity; - public final int minimalSize; + + /** + * Minimal width of activity in pixels to be able to display its content. + * + *

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 + * width, then the system will set the same minimal width on all other activities in the + * task. It will also ignore any other minimal width attributes of non-root activities. + * + * @attr ref android.R.styleable#AndroidManifestLayout_minimalWidth + */ + public final int minimalWidth; + + /** + * Minimal height of activity in pixels to be able to display its content. + * + *

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 + * height, then the system will set the same minimal height on all other activities in the + * task. It will also ignore any other minimal height attributes of non-root activities. + * + * @attr ref android.R.styleable#AndroidManifestLayout_minimalHeight + */ + public final int minimalHeight; } } diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 84605bb14d7da..ea251f648034f 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -3648,12 +3648,15 @@ public class PackageParser { int gravity = sw.getInt( com.android.internal.R.styleable.AndroidManifestLayout_gravity, Gravity.CENTER); - int minimalSize = sw.getDimensionPixelSize( - com.android.internal.R.styleable.AndroidManifestLayout_minimalSize, + int minimalWidth = sw.getDimensionPixelSize( + com.android.internal.R.styleable.AndroidManifestLayout_minimalWidth, + -1); + int minimalHeight = sw.getDimensionPixelSize( + com.android.internal.R.styleable.AndroidManifestLayout_minimalHeight, -1); sw.recycle(); - a.info.layout = new ActivityInfo.Layout(width, widthFraction, - height, heightFraction, gravity, minimalSize); + a.info.windowLayout = new ActivityInfo.WindowLayout(width, widthFraction, + height, heightFraction, gravity, minimalWidth, minimalHeight); } private Activity parseActivityAlias(Package owner, Resources res, @@ -3735,7 +3738,7 @@ public class PackageParser { info.uiOptions = target.info.uiOptions; info.parentActivityName = target.info.parentActivityName; info.maxRecents = target.info.maxRecents; - info.layout = target.info.layout; + info.windowLayout = target.info.windowLayout; info.resizeMode = target.info.resizeMode; info.encryptionAware = info.directBootAware = target.info.directBootAware; diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 57168235b208a..d1c08958f9347 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -2262,13 +2262,20 @@ + + - + activities launched in the task. That is if the root activity of a task set minimal height, + then the system will set the same minimal height on all other activities in the task. It + will also ignore any other minimal height attributes of non-root activities. --> + diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 7b85c7ed331f2..ed7b4d8f07907 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2664,7 +2664,8 @@ - + + diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index ee406dab131f6..e4ffde2ad0094 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -4932,18 +4932,18 @@ final class ActivityStack { // add the task to stack first, mTaskPositioner might need the stack association addTask(task, toTop, "createTaskRecord"); final boolean isLockscreenShown = mService.mLockScreenShown == LOCK_SCREEN_SHOWN; - if (!layoutTaskInStack(task, info.layout) && mBounds != null && task.isResizeable() + if (!layoutTaskInStack(task, info.windowLayout) && mBounds != null && task.isResizeable() && !isLockscreenShown) { task.updateOverrideConfiguration(mBounds); } return task; } - boolean layoutTaskInStack(TaskRecord task, ActivityInfo.Layout layout) { + boolean layoutTaskInStack(TaskRecord task, ActivityInfo.WindowLayout windowLayout) { if (mTaskPositioner == null) { return false; } - mTaskPositioner.updateDefaultBounds(task, mTaskHistory, layout); + mTaskPositioner.updateDefaultBounds(task, mTaskHistory, windowLayout); return true; } diff --git a/services/core/java/com/android/server/am/LaunchingTaskPositioner.java b/services/core/java/com/android/server/am/LaunchingTaskPositioner.java index 4ba1d0d660c27..d652341874f15 100644 --- a/services/core/java/com/android/server/am/LaunchingTaskPositioner.java +++ b/services/core/java/com/android/server/am/LaunchingTaskPositioner.java @@ -109,22 +109,22 @@ class LaunchingTaskPositioner { * * @param task Task for which we want to find bounds that won't collide with other. * @param tasks Existing tasks with which we don't want to collide. - * @param layout Optional information from the client about how it would like to be sized + * @param windowLayout Optional information from the client about how it would like to be sized * and positioned. */ void updateDefaultBounds(TaskRecord task, ArrayList tasks, - @Nullable ActivityInfo.Layout layout) { + @Nullable ActivityInfo.WindowLayout windowLayout) { if (!mDefaultStartBoundsConfigurationSet) { return; } - if (layout == null) { + if (windowLayout == null) { positionCenter(task, tasks, mDefaultFreeformWidth, mDefaultFreeformHeight); return; } - int width = getFinalWidth(layout); - int height = getFinalHeight(layout); - int verticalGravity = layout.gravity & Gravity.VERTICAL_GRAVITY_MASK; - int horizontalGravity = layout.gravity & Gravity.HORIZONTAL_GRAVITY_MASK; + int width = getFinalWidth(windowLayout); + int height = getFinalHeight(windowLayout); + int verticalGravity = windowLayout.gravity & Gravity.VERTICAL_GRAVITY_MASK; + int horizontalGravity = windowLayout.gravity & Gravity.HORIZONTAL_GRAVITY_MASK; if (verticalGravity == Gravity.TOP) { if (horizontalGravity == Gravity.RIGHT) { positionTopRight(task, tasks, width, height); @@ -140,30 +140,30 @@ class LaunchingTaskPositioner { } else { // Some fancy gravity setting that we don't support yet. We just put the activity in the // center. - Slog.w(TAG, "Received unsupported gravity: " + layout.gravity + Slog.w(TAG, "Received unsupported gravity: " + windowLayout.gravity + ", positioning in the center instead."); positionCenter(task, tasks, width, height); } } - private int getFinalWidth(ActivityInfo.Layout layout) { + private int getFinalWidth(ActivityInfo.WindowLayout windowLayout) { int width = mDefaultFreeformWidth; - if (layout.width > 0) { - width = layout.width; + if (windowLayout.width > 0) { + width = windowLayout.width; } - if (layout.widthFraction > 0) { - width = (int) (mAvailableRect.width() * layout.widthFraction); + if (windowLayout.widthFraction > 0) { + width = (int) (mAvailableRect.width() * windowLayout.widthFraction); } return width; } - private int getFinalHeight(ActivityInfo.Layout layout) { + private int getFinalHeight(ActivityInfo.WindowLayout windowLayout) { int height = mDefaultFreeformHeight; - if (layout.height > 0) { - height = layout.height; + if (windowLayout.height > 0) { + height = windowLayout.height; } - if (layout.heightFraction > 0) { - height = (int) (mAvailableRect.height() * layout.heightFraction); + if (windowLayout.heightFraction > 0) { + height = (int) (mAvailableRect.height() * windowLayout.heightFraction); } return height; } diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 4eae45c616e58..d7a19208a6c99 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -72,8 +72,6 @@ import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_IF_WHITELIST import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_NEVER; import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS; import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZEABLE; -import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE; -import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ADD_REMOVE; @@ -254,9 +252,10 @@ final class TaskRecord { // The information is persisted and used to determine the appropriate stack to launch the // task into on restore. Rect mLastNonFullscreenBounds = null; - // Minimal size for width/height of this task when it's resizeable. -1 means it should use the - // default minimal size. - final int mMinimalSize; + // Minimal width and height of this task when it's resizeable. -1 means it should use the + // default minimal width/height. + int mMinimalWidth; + int mMinimalHeight; // Ranking (from top) of this task among all visible tasks. (-1 means it's not visible) // This number will be assigned when we evaluate OOM scores for all visible tasks. @@ -281,7 +280,7 @@ final class TaskRecord { mCallingUid = info.applicationInfo.uid; mCallingPackage = info.packageName; setIntent(_intent, info); - mMinimalSize = info != null && info.layout != null ? info.layout.minimalSize : -1; + setMinDimensions(info); } TaskRecord(ActivityManagerService service, int _taskId, ActivityInfo info, Intent _intent, @@ -301,6 +300,7 @@ final class TaskRecord { mCallingUid = info.applicationInfo.uid; mCallingPackage = info.packageName; setIntent(_intent, info); + setMinDimensions(info); taskType = ActivityRecord.APPLICATION_ACTIVITY_TYPE; isPersistable = true; @@ -311,7 +311,6 @@ final class TaskRecord { taskType = APPLICATION_ACTIVITY_TYPE; mTaskToReturnTo = HOME_ACTIVITY_TYPE; lastTaskDescription = _taskDescription; - mMinimalSize = info != null && info.layout != null ? info.layout.minimalSize : -1; } private TaskRecord(ActivityManagerService service, int _taskId, Intent _intent, @@ -365,7 +364,7 @@ final class TaskRecord { mResizeMode = resizeMode; mPrivileged = privileged; ActivityInfo info = (mActivities.size() > 0) ? mActivities.get(0).info : null; - mMinimalSize = info != null && info.layout != null ? info.layout.minimalSize : -1; + setMinDimensions(info); } void touchActiveTime() { @@ -471,6 +470,17 @@ final class TaskRecord { setLockTaskAuth(); } + /** Sets the original minimal width and height. */ + private void setMinDimensions(ActivityInfo info) { + if (info != null && info.windowLayout != null) { + mMinimalWidth = info.windowLayout.minimalWidth; + mMinimalHeight = info.windowLayout.minimalHeight; + } else { + mMinimalWidth = -1; + mMinimalHeight = -1; + } + } + /** * Return true if the input activity has the same intent resolution as the intent this task * record is based on (normally the root activity intent). @@ -1342,35 +1352,41 @@ final class TaskRecord { if (bounds == null) { return; } - int minimalSize = mMinimalSize; + int minimalWidth = mMinimalWidth; + int minimalHeight = mMinimalHeight; // If the task has no requested minimal size, we'd like to enforce a minimal size // so that the user can not render the task too small to manipulate. We don't need // to do this for the pinned stack as the bounds are controlled by the system. - if (minimalSize == -1 && stack.mStackId != PINNED_STACK_ID) { - minimalSize = mService.mStackSupervisor.mDefaultMinimalSizeOfResizeableTask; + if (stack.mStackId != PINNED_STACK_ID) { + if (minimalWidth == -1) { + minimalWidth = mService.mStackSupervisor.mDefaultMinimalSizeOfResizeableTask; + } + if (minimalHeight == -1) { + minimalHeight = mService.mStackSupervisor.mDefaultMinimalSizeOfResizeableTask; + } } - final boolean adjustWidth = minimalSize > bounds.width(); - final boolean adjustHeight = minimalSize > bounds.height(); + final boolean adjustWidth = minimalWidth > bounds.width(); + final boolean adjustHeight = minimalHeight > bounds.height(); if (!(adjustWidth || adjustHeight)) { return; } if (adjustWidth) { if (mBounds != null && bounds.right == mBounds.right) { - bounds.left = bounds.right - minimalSize; + bounds.left = bounds.right - minimalWidth; } else { // Either left bounds match, or neither match, or the previous bounds were // fullscreen and we default to keeping left. - bounds.right = bounds.left + minimalSize; + bounds.right = bounds.left + minimalWidth; } } if (adjustHeight) { if (mBounds != null && bounds.bottom == mBounds.bottom) { - bounds.top = bounds.bottom - minimalSize; + bounds.top = bounds.bottom - minimalHeight; } else { // Either top bounds match, or neither match, or the previous bounds were // fullscreen and we default to keeping top. - bounds.bottom = bounds.top + minimalSize; + bounds.bottom = bounds.top + minimalHeight; } } }