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

Commit 90ae4d54 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Deprecate windowSplashscreenContent" into sc-dev am: 483ba791 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13816787

Change-Id: I7ff05b72cd710a153ab253acfa6276fa2eae1db4
parents e897fdcd 483ba791

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ package android { 
    field public static final int windowSplashScreenAnimationDuration = 16844334; // 0x101062e

    field public static final int windowSplashScreenBackground = 16844332; // 0x101062c

    field public static final int windowSplashScreenBrandingImage = 16844335; // 0x101062f

    field public static final int windowSplashscreenContent = 16844132; // 0x1010564

    field @Deprecated public static final int windowSplashscreenContent = 16844132; // 0x1010564

    field @Deprecated public static final int windowSwipeToDismiss = 16843763; // 0x10103f3

    field public static final int windowTitleBackgroundStyle = 16842844; // 0x101005c

    field public static final int windowTitleSize = 16842842; // 0x101005a

core/res/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -2194,6 +2194,7 @@ 
             Note that even if no splashscreen content is set on the theme, the system may still

             show a splash screen using the other attributes on the theme, like the

             {@link android.R.attr#windowBackground}.

             {@deprecated Use windowSplashscreenAnimatedIcon instead.}

             -->

        <attr name="windowSplashscreenContent" format="reference" />

































core/res/res/values/public.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -2816,6 +2816,7 @@













    <public type="attr" name="iconSpaceReserved" id="0x01010561"/>















    <public type="attr" name="defaultFocusHighlightEnabled" id="0x01010562" />















    <public type="attr" name="persistentWhenFeatureAvailable" id="0x01010563"/>













    <!-- {@deprecated Use windowSplashscreenAnimatedIcon instead } -->















    <public type="attr" name="windowSplashscreenContent" id="0x01010564" />















    <!-- @hide @SystemApi -->















    <public type="attr" name="requiredSystemPropertyName" id="0x01010565" />