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

Commit 46ae660b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Implement new splash screen API" into oc-dev

parents e52a1bfe 7d0d1027

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1541,6 +1541,7 @@ package android { 
    field public static final int windowShowAnimation = 16842934; // 0x10100b6

    field public static final int windowShowWallpaper = 16843410; // 0x1010292

    field public static final int windowSoftInputMode = 16843307; // 0x101022b

    field public static final int windowSplashscreenContent = 16844135; // 0x1010567

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

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,7 @@ package android { 
    field public static final int windowShowAnimation = 16842934; // 0x10100b6

    field public static final int windowShowWallpaper = 16843410; // 0x1010292

    field public static final int windowSoftInputMode = 16843307; // 0x101022b

    field public static final int windowSplashscreenContent = 16844135; // 0x1010567

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

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

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1541,6 +1541,7 @@ package android { 
    field public static final int windowShowAnimation = 16842934; // 0x10100b6

    field public static final int windowShowWallpaper = 16843410; // 0x1010292

    field public static final int windowSoftInputMode = 16843307; // 0x101022b

    field public static final int windowSplashscreenContent = 16844135; // 0x1010567

    field 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

+14 −4
Original line number Diff line number Diff line
@@ -430,10 +430,9 @@ 
            <flag name="adjustNothing" value="0x30" />

        </attr>



        <!-- Flag allowing you to disable the preview animation for a window.

             The default value is false; if set to true, the system can never

             use the window's theme to show a preview of it before your

             actual instance is shown to the user. -->

        <!-- Flag allowing you to disable the splash screen for a window. The default value is

             false; if set to true, the system can never use the window's theme to show a splash

             screen before your actual instance is shown to the user. -->

        <attr name="windowDisablePreview" format="boolean" />



        <!-- Flag indicating that this window should not be displayed at all.
@@ -2049,6 +2048,17 @@ 
             Corresponds to setting {@link android.view.View#SYSTEM_UI_FLAG_LIGHT_STATUS_BAR} on

             the decor view. -->

        <attr name="windowLightStatusBar" format="boolean" />



        <!-- Reference to a drawable to be used as the splash screen content of the window. This

             drawable will be placed on top of the {@link android.R.attr#windowBackground} with its

             bounds inset by the system bars. If the drawable should not be inset by the system

             bars, use a fullscreen theme.

             <p>

             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}.

             -->

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

    </declare-styleable>



    <!-- The set of attributes that describe a AlertDialog's theme. -->

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -2816,6 +2816,7 @@ 
        <public name="iconSpaceReserved"/>

        <public name="defaultFocusHighlightEnabled" />

        <public name="persistentFeature"/>

        <public name="windowSplashscreenContent" />

    </public-group>



    <public-group type="style" first-id="0x010302e0">
@@ -2835,7 +2836,6 @@ 
        <public name="paste_as_plain_text" />

    </public-group>





  <!-- ===============================================================

       DO NOT ADD UN-GROUPED ITEMS HERE