Merge pull request #2624 from brandonpage/Android-15-Edge-To-Edge

brandonpage · web-flow · commit a3d8d4152f8b · 2024-10-02T17:55:34.000-07:00
Android 15 support
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.5.0")
+        classpath("com.android.tools.build:gradle:8.6.1")
         classpath("io.github.gradle-nexus:publish-plugin:1.1.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
         classpath("org.jacoco:org.jacoco.core:0.8.12")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:8.5.0")
+    implementation("com.android.tools.build:gradle:8.6.1")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
 }
diff --git a/hybrid/HybridSampleApps/AccountEditor/build.gradle.kts b/hybrid/HybridSampleApps/AccountEditor/build.gradle.kts
@@ -13,10 +13,10 @@ dependencies {
 android {
     namespace = "com.salesforce.samples.accounteditor"
 
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
-        targetSdk = 34
+        targetSdk = 35
         minSdk = 26
     }
 
diff --git a/hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build.gradle.kts b/hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build.gradle.kts
@@ -13,10 +13,10 @@ dependencies {
 android {
     namespace = "com.salesforce.samples.mobilesyncexplorerhybrid"
 
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
-        targetSdk = 34
+        targetSdk = 35
         minSdk = 26
     }
 
diff --git a/libs/SalesforceSDK/res/drawable/sf__fix_status_bar.xml b/libs/SalesforceSDK/res/drawable/sf__fix_status_bar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/sf__status_bar_background" android:height="100dp" >
+        <shape android:shape="rectangle">
+            <size android:height="100dp" android:width="100dp"/>
+            <solid android:color="@color/sf__primary_color"/>
+        </shape>
+    </item>
+
+    <item android:id="@+id/sf__nav_bar_background" android:height="100dp">
+        <shape android:shape="rectangle">
+            <size android:height="100dp" android:width="100dp"/>
+            <solid android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/libs/SalesforceSDK/res/layout/sf__dev_info.xml b/libs/SalesforceSDK/res/layout/sf__dev_info.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:id="@+id/sf__dev_menu_layout"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ListView android:id="@+id/list" android:layout_width="match_parent"
diff --git a/libs/SalesforceSDK/res/layout/sf__server_picker.xml b/libs/SalesforceSDK/res/layout/sf__server_picker.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/sf__server_picker_layout"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="?android:colorBackground" >
diff --git a/libs/SalesforceSDK/res/values/sf__styles.xml b/libs/SalesforceSDK/res/values/sf__styles.xml
@@ -112,6 +112,7 @@
 
     <style name="SalesforceSDK_Dark.Login">
         <item name="android:navigationBarColor">@color/sf__background</item>
+        <item name="android:colorBackground">@color/sf__background</item>
     </style>
 
     <style name="SalesforceSDKActionBar" parent="@android:style/Widget.Material.ActionBar">
@@ -189,6 +190,7 @@
         <item name="android:navigationBarColor">@color/sf__background_dark</item>
         <item name="sfNegativeButtonTextColor">@color/sf__secondary_color_dark</item>
         <item name="sfNegativeButtonBorderColor">@color/sf__secondary_color_dark</item>
+        <item name="android:windowLightStatusBar">false</item>
     </style>
 
     <style name="SalesforceSDK.ScreenLock.ErrorMessage">
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/idp/IDPManager.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/auth/idp/IDPManager.kt
@@ -119,7 +119,6 @@ internal class IDPManager(
                     spConfig,
                     codeChallenge
                 ) { result ->
-                    authCodeActivity.finish()
                     onResult(result)
                 }
             }
@@ -214,6 +213,7 @@ internal class IDPManager(
                 addCategory(Intent.CATEGORY_DEFAULT)
             }
             startActivity(activeFlow.context, launchIntent)
+            activeFlow.authCodeActivity?.finish()
         } else {
             activeFlow.onStatusUpdate(Status.ERROR_RECEIVED_FROM_SP)
         }
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/AccountSwitcherActivity.java
@@ -26,6 +26,8 @@
  */
 package com.salesforce.androidsdk.ui;
 
+import static com.salesforce.androidsdk.ui.EdgeToEdgeUtilKt.fixEdgeToEdge;
+
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
@@ -67,6 +69,8 @@ public void onCreate(Bundle savedInstance) {
 		} else {
 			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
 		}
+
+		fixEdgeToEdge(this, findViewById(R.id.sf__account_select_layout));
 	}
 
 	@Override
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/DevInfoActivity.java
@@ -26,6 +26,8 @@
  */
 package com.salesforce.androidsdk.ui;
 
+import static com.salesforce.androidsdk.ui.EdgeToEdgeUtilKt.fixEdgeToEdge;
+
 import android.os.Bundle;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
@@ -63,6 +65,8 @@ protected void onCreate(Bundle savedInstanceState) {
         String[] from = new String[] {NAME, VALUE};
         int[] to = new int[] { android.R.id.text1, android.R.id.text2};
         ((ListView) findViewById(R.id.list)).setAdapter(new SimpleAdapter(this, listData, android.R.layout.simple_list_item_2, from, to));
+
+        fixEdgeToEdge(this, findViewById(R.id.sf__dev_menu_layout));
     }
 
     private List<Map<String, String>> prepareListData(List<String> rawData) {
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/EdgeToEdgeUtil.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/EdgeToEdgeUtil.kt
@@ -0,0 +1,32 @@
+package com.salesforce.androidsdk.ui
+
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE
+import android.view.View
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import com.salesforce.androidsdk.R.drawable.sf__fix_status_bar
+
+// TODO: Remove this in 13.0 after rewriting screens in compose.
+internal fun AppCompatActivity.fixEdgeToEdge(view: View) {
+    if (application.applicationInfo.targetSdkVersion > UPSIDE_DOWN_CAKE && SDK_INT > UPSIDE_DOWN_CAKE) {
+        enableEdgeToEdge()
+        ViewCompat.setOnApplyWindowInsetsListener(view) { listenerView, windowInsets ->
+            val insets = windowInsets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+
+            // Fix screens being drawn behind status and navigation bars
+            listenerView.updatePadding(insets.left, insets.top, insets.right, insets.bottom)
+
+            // Fix transparent status bar not matching action bar
+            view.background = ResourcesCompat.getDrawable(resources, sf__fix_status_bar, null)
+
+            WindowInsetsCompat.CONSUMED
+        }
+    }
+}
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/LoginActivity.kt
@@ -78,6 +78,7 @@ import androidx.biometric.BiometricPrompt.PromptInfo
 import androidx.core.content.ContextCompat
 import androidx.core.content.ContextCompat.getMainExecutor
 import androidx.core.content.ContextCompat.registerReceiver
+import com.salesforce.androidsdk.R.id.sf__auth_container_phone
 import com.salesforce.androidsdk.R.id.sf__bio_login_button
 import com.salesforce.androidsdk.R.id.sf__idp_login_button
 import com.salesforce.androidsdk.R.id.sf__menu_clear_cookies
@@ -245,6 +246,8 @@ open class LoginActivity : AppCompatActivity(), OAuthWebviewHelperEvents {
         requestedOrientation = if (salesforceSDKManager.compactScreen(this))
             ActivityInfo.SCREEN_ORIENTATION_PORTRAIT else
             ActivityInfo.SCREEN_ORIENTATION_FULL_USER
+
+        fixEdgeToEdge(findViewById(sf__auth_container_phone))
     }
 
     override fun onDestroy() {
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ManageSpaceActivity.java
@@ -26,6 +26,8 @@
  */
 package com.salesforce.androidsdk.ui;
 
+import static com.salesforce.androidsdk.ui.EdgeToEdgeUtilKt.fixEdgeToEdge;
+
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -53,6 +55,7 @@ public void onCreate(Bundle savedState) {
 		manageSpaceDialog = buildManageSpaceDialog();
 		manageSpaceDialog.setCanceledOnTouchOutside(false);
 		manageSpaceDialog.show();
+		fixEdgeToEdge(this, findViewById(R.id.manage_space_layout));
 	}
 
 	@Override
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ScreenLockActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ScreenLockActivity.java
@@ -51,6 +51,7 @@
 import android.widget.TextView;
 import android.window.OnBackInvokedDispatcher;
 
+import androidx.activity.EdgeToEdge;
 import androidx.annotation.NonNull;
 import androidx.biometric.BiometricManager;
 import androidx.biometric.BiometricPrompt;
@@ -82,6 +83,8 @@ public class ScreenLockActivity extends FragmentActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        EdgeToEdge.enable(this);
+
         // Protect against screenshots.
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
                 WindowManager.LayoutParams.FLAG_SECURE);
diff --git a/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ServerPickerActivity.java b/libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/ServerPickerActivity.java
@@ -27,6 +27,7 @@
 package com.salesforce.androidsdk.ui;
 
 import static com.salesforce.androidsdk.security.BiometricAuthenticationManager.SHOW_BIOMETRIC;
+import static com.salesforce.androidsdk.ui.EdgeToEdgeUtilKt.fixEdgeToEdge;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -149,6 +150,8 @@ public void onCreate(Bundle savedInstanceState) {
         } else {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_USER);
         }
+
+        fixEdgeToEdge(this, findViewById(R.id.sf__server_picker_layout));
     }
 
     @Override
diff --git a/native/NativeSampleApps/AppConfigurator/build.gradle.kts b/native/NativeSampleApps/AppConfigurator/build.gradle.kts
@@ -13,10 +13,10 @@ dependencies {
 android {
     namespace = "com.salesforce.samples.appconfigurator"
 
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
-        targetSdk = 34
+        targetSdk = 35
         minSdk = 26
     }
 
diff --git a/native/NativeSampleApps/ConfiguredApp/build.gradle.kts b/native/NativeSampleApps/ConfiguredApp/build.gradle.kts
@@ -15,10 +15,10 @@ dependencies {
 android {
     namespace = "com.salesforce.samples.configuredapp"
 
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
-        targetSdk = 34
+        targetSdk = 35
         minSdk = 26
     }
 
diff --git a/native/NativeSampleApps/RestExplorer/build.gradle.kts b/native/NativeSampleApps/RestExplorer/build.gradle.kts
@@ -30,10 +30,10 @@ android {
     namespace = "com.salesforce.samples.restexplorer"
     testNamespace = "com.salesforce.samples.restexplorer.tests"
 
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
-        targetSdk = 34
+        targetSdk = 35
         minSdk = 26
     }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath("com.android.tools.build:gradle:8.5.0")`
	`12`	`+ classpath("com.android.tools.build:gradle:8.6.1")`
`13`	`13`	`classpath("io.github.gradle-nexus:publish-plugin:1.1.0")`
`14`	`14`	`classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")`
`15`	`15`	`classpath("org.jacoco:org.jacoco.core:0.8.12")`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ repositories {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- implementation("com.android.tools.build:gradle:8.5.0")`
	`10`	`+ implementation("com.android.tools.build:gradle:8.6.1")`
`11`	`11`	`implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")`
`12`	`12`	`implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ internal class IDPManager(`
`119`	`119`	`spConfig,`
`120`	`120`	`codeChallenge`
`121`	`121`	`) { result ->`
`122`		`- authCodeActivity.finish()`
`123`	`122`	`onResult(result)`
`124`	`123`	`}`
`125`	`124`	`}`
`@@ -214,6 +213,7 @@ internal class IDPManager(`
`214`	`213`	`addCategory(Intent.CATEGORY_DEFAULT)`
`215`	`214`	`}`
`216`	`215`	`startActivity(activeFlow.context, launchIntent)`
	`216`	`+ activeFlow.authCodeActivity?.finish()`
`217`	`217`	`} else {`
`218`	`218`	`activeFlow.onStatusUpdate(Status.ERROR_RECEIVED_FROM_SP)`
`219`	`219`	`}`