From c110eeb4a2a42a04ef02f06c138aaf19f2221b54 Mon Sep 17 00:00:00 2001
From: Chiara Chiappini <cchiappini@google.com>
Date: Thu, 18 Apr 2024 14:20:07 +0100
Subject: [PATCH] Removes splashscreen support for pre 33 devices

---
 .../src/main/res/drawable/ic_landscape_vd_theme_24.xml | 10 +++++-----
 .../main/res/drawable/ic_short_text_vd_theme_24.xml    |  3 ---
 .../src/main/res/drawable/ic_title_vd_theme_24.xml     | 10 +++++-----
 Complications/Wearable/src/main/res/values/styles.xml  |  3 ---
 .../composestarter/presentation/MainActivity.kt        |  3 +++
 ComposeStarter/app/src/main/res/values/strings.xml     |  7 +++++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Complications/Wearable/src/main/res/drawable/ic_landscape_vd_theme_24.xml b/Complications/Wearable/src/main/res/drawable/ic_landscape_vd_theme_24.xml
index f88d47b68..1b9b1e0e4 100644
--- a/Complications/Wearable/src/main/res/drawable/ic_landscape_vd_theme_24.xml
+++ b/Complications/Wearable/src/main/res/drawable/ic_landscape_vd_theme_24.xml
@@ -15,11 +15,11 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M14,6l-3.75,5 2.85,3.8 -1.6,1.2C9.81,13.75 7,10 7,10l-6,8h22L14,6z"/>
diff --git a/Complications/Wearable/src/main/res/drawable/ic_short_text_vd_theme_24.xml b/Complications/Wearable/src/main/res/drawable/ic_short_text_vd_theme_24.xml
index 76c4090dc..162c1f1ef 100644
--- a/Complications/Wearable/src/main/res/drawable/ic_short_text_vd_theme_24.xml
+++ b/Complications/Wearable/src/main/res/drawable/ic_short_text_vd_theme_24.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2021 The Android Open Source Project
-
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-
           http://www.apache.org/licenses/LICENSE-2.0
-
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/Complications/Wearable/src/main/res/drawable/ic_title_vd_theme_24.xml b/Complications/Wearable/src/main/res/drawable/ic_title_vd_theme_24.xml
index aba1cd13b..728ba04c3 100644
--- a/Complications/Wearable/src/main/res/drawable/ic_title_vd_theme_24.xml
+++ b/Complications/Wearable/src/main/res/drawable/ic_title_vd_theme_24.xml
@@ -15,11 +15,11 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M5,4v3h5.5v12h3V7H19V4z"/>
diff --git a/Complications/Wearable/src/main/res/values/styles.xml b/Complications/Wearable/src/main/res/values/styles.xml
index eda0b2575..1bdf6d420 100644
--- a/Complications/Wearable/src/main/res/values/styles.xml
+++ b/Complications/Wearable/src/main/res/values/styles.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2021 The Android Open Source Project
-
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-
           http://www.apache.org/licenses/LICENSE-2.0
-
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt b/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt
index c3c8a3d3d..9edfb4192 100644
--- a/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt
+++ b/ComposeStarter/app/src/main/java/com/example/android/wearable/composestarter/presentation/MainActivity.kt
@@ -37,6 +37,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.wear.compose.foundation.ExperimentalWearFoundationApi
 import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Text
@@ -76,6 +77,8 @@ import com.google.android.horologist.compose.rotaryinput.rotaryWithScroll
  */
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
         setContent {
diff --git a/ComposeStarter/app/src/main/res/values/strings.xml b/ComposeStarter/app/src/main/res/values/strings.xml
index 2064d3434..589152374 100644
--- a/ComposeStarter/app/src/main/res/values/strings.xml
+++ b/ComposeStarter/app/src/main/res/values/strings.xml
@@ -13,6 +13,9 @@
 -->
 <resources>
     <string name="app_name">ComposeStarter</string>
-
-    <string name="hello_world">From the Round world,\nHello, %1$s!</string>
+    <!--
+    This string is used for square devices and overridden by hello_world in
+    values-round/strings.xml for round devices.
+    -->
+    <string name="hello_world">From the Square world,\nHello, %1$s!</string>
 </resources>