Skip to content

Commit 2c18b1c

Browse files
@W-13610752: LoginActivity UI appears different in 11.0 (#2427)
1 parent fa666d5 commit 2c18b1c

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

libs/SalesforceSDK/res/values/sf__styles.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
<resources xmlns:android="http://schemas.android.com/apk/res/android">
44

5-
<style name="SalesforceSDK" parent="Theme.AppCompat.DayNight">
5+
<style name="SalesforceSDK" parent="Theme.AppCompat.Light.DarkActionBar">
6+
<item name="colorPrimary">@color/sf__primary_color</item>
7+
<item name="titleTextColor">@color/sf__secondary_color</item>
68
<item name="android:actionBarStyle">@style/SalesforceSDKActionBar</item>
79
<item name="android:colorPrimary">@color/sf__primary_color</item>
810
<item name="android:colorPrimaryDark">@color/sf__primary_color</item>

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@
2626
*/
2727
package com.salesforce.androidsdk.ui;
2828

29-
import android.app.Activity;
3029
import android.os.Bundle;
3130
import android.view.View;
3231
import android.widget.AdapterView;
3332
import android.widget.ListView;
3433

34+
import androidx.appcompat.app.AppCompatActivity;
35+
3536
import com.salesforce.androidsdk.R;
3637
import com.salesforce.androidsdk.accounts.UserAccount;
3738
import com.salesforce.androidsdk.accounts.UserAccountManager;
@@ -46,7 +47,7 @@
4647
*
4748
* @author bhariharan
4849
*/
49-
public class AccountSwitcherActivity extends Activity {
50+
public class AccountSwitcherActivity extends AppCompatActivity {
5051

5152
protected UserAccountManager userAccMgr;
5253

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*/
2727
package com.salesforce.androidsdk.ui;
2828

29-
import android.app.Activity;
3029
import android.os.Bundle;
3130
import android.widget.ListView;
3231
import android.widget.SimpleAdapter;

libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@
2626
*/
2727
package com.salesforce.androidsdk.ui;
2828

29-
import android.app.Activity;
3029
import android.app.AlertDialog;
3130
import android.content.DialogInterface;
3231
import android.os.Bundle;
3332

33+
import androidx.appcompat.app.AppCompatActivity;
34+
3435
import com.salesforce.androidsdk.R;
3536
import com.salesforce.androidsdk.app.SalesforceSDKManager;
3637

@@ -40,7 +41,7 @@
4041
*
4142
* @author bhariharan
4243
*/
43-
public class ManageSpaceActivity extends Activity {
44+
public class ManageSpaceActivity extends AppCompatActivity {
4445

4546
private AlertDialog manageSpaceDialog;
4647

0 commit comments

Comments
 (0)