From 2c18b1cb8e72837e871882b65786b132b8b127f2 Mon Sep 17 00:00:00 2001
From: "Eric C. Johnson" <Johnson.Eric@Salesforce.com>
Date: Thu, 22 Jun 2023 12:41:17 -0600
Subject: [PATCH] @W-13610752: LoginActivity UI appears different in 11.0
 (#2427)

---
 libs/SalesforceSDK/res/values/sf__styles.xml                 | 4 +++-
 .../salesforce/androidsdk/ui/AccountSwitcherActivity.java    | 5 +++--
 .../src/com/salesforce/androidsdk/ui/DevInfoActivity.java    | 1 -
 .../com/salesforce/androidsdk/ui/ManageSpaceActivity.java    | 5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/SalesforceSDK/res/values/sf__styles.xml b/libs/SalesforceSDK/res/values/sf__styles.xml
index f2e85dbdda..bf1f1e48b2 100644
--- a/libs/SalesforceSDK/res/values/sf__styles.xml
+++ b/libs/SalesforceSDK/res/values/sf__styles.xml
@@ -2,7 +2,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="SalesforceSDK" parent="Theme.AppCompat.DayNight">
+    <style name="SalesforceSDK" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/sf__primary_color</item>
+        <item name="titleTextColor">@color/sf__secondary_color</item>
         <item name="android:actionBarStyle">@style/SalesforceSDKActionBar</item>
         <item name="android:colorPrimary">@color/sf__primary_color</item>
         <item name="android:colorPrimaryDark">@color/sf__primary_color</item>
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java
index 9282129ec4..835bda669a 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java
@@ -26,12 +26,13 @@
  */
 package com.salesforce.androidsdk.ui;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.salesforce.androidsdk.R;
 import com.salesforce.androidsdk.accounts.UserAccount;
 import com.salesforce.androidsdk.accounts.UserAccountManager;
@@ -46,7 +47,7 @@
  *
  * @author bhariharan
  */
-public class AccountSwitcherActivity extends Activity {
+public class AccountSwitcherActivity extends AppCompatActivity {
 
 	protected UserAccountManager userAccMgr;
 
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java
index 37bb13e6a0..0cf0e63f9a 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java
@@ -26,7 +26,6 @@
  */
 package com.salesforce.androidsdk.ui;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java
index 4540eee815..3734533fc7 100644
--- a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java
+++ b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java
@@ -26,11 +26,12 @@
  */
 package com.salesforce.androidsdk.ui;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.salesforce.androidsdk.R;
 import com.salesforce.androidsdk.app.SalesforceSDKManager;
 
@@ -40,7 +41,7 @@
  *
  * @author bhariharan
  */
-public class ManageSpaceActivity extends Activity {
+public class ManageSpaceActivity extends AppCompatActivity {
 
 	private AlertDialog manageSpaceDialog;