diff options
| author | 2021-03-18 14:01:57 +0000 | |
|---|---|---|
| committer | 2021-03-18 14:01:57 +0000 | |
| commit | 483ba791b4bae8bebdd76ce7c62829e30f1d1d1f (patch) | |
| tree | b63e741fca3948e389faa18aa350dd568e5e67a7 | |
| parent | 18417de2c5b7599fce743e18ccbd1883bb3960b3 (diff) | |
| parent | 1266ea4c36ce1aeb64a806b15ece4c2bd186f088 (diff) | |
Merge "Deprecate windowSplashscreenContent" into sc-dev
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index f23483c26207..a769493928a3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 62278d5b86f1..9e1a08527330 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -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" /> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 0979ab556432..ba21679df2fe 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> |