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

Merge "Deprecate windowSplashscreenContent" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-18 14:01:57 +00:00
committed by Android (Google) Code Review
parent 18417de2c5 1266ea4c36
commit 483ba791b4
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -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

1
core/res/res/values/attrs.xml
View File

@@ -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" />

1
core/res/res/values/public.xml
View File

@@ -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" />