From 1266ea4c36ce1aeb64a806b15ece4c2bd186f088 Mon Sep 17 00:00:00 2001
From: Vadim Caen <caen@google.com>
Date: Tue, 9 Mar 2021 13:55:38 +0000
Subject: [PATCH] Deprecate windowSplashscreenContent

windowSplashscreenContent is no longer needed with the new splashscreen
api and is replaced by windowSplashscreenAnimatedIcon.

Test: N/A
Bug: 182271482
Change-Id: Ib216a2d9c5d41ef71e357e4d8ad453baeef6755e
---
 core/api/current.txt           | 2 +-
 core/res/res/values/attrs.xml  | 1 +
 core/res/res/values/public.xml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 57e256142eb09..27ab71d1d4961 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1675,7 +1675,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 efc8fe9aafa24..23183943fd670 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 7702ee437c432..2f9d9355413f3 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" />