Merge pull request #557 from wmathurin/dev

Fix for latest cordova android

plugin.xml

@@ -129,10 +129,11 @@
 
     <!-- Fixes the activity tag in the Manifest -->
     <edit-config file="app/src/main/AndroidManifest.xml" target="/manifest/application/activity" mode="merge">
-      <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale"
+      <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
           android:label="@string/app_name"
           android:name="com.salesforce.androidsdk.phonegap.ui.SalesforceDroidGapActivity"
-          android:theme="@android:style/Theme.Black.NoTitleBar"
+          android:theme="@style/Theme.AppCompat.NoActionBar"
+          android:windowSoftInputMode="adjustResize"
           android:launchMode="singleTop" 
           android:allowBackup="false" />
     </edit-config>

src/android/libs/SalesforceHybrid/res/xml/config.xml

@@ -3,6 +3,8 @@
     id        = "com.salesforce.androidsdk"
     version   = "9.2.0">
 
+    <content src="index.html" />
+
     <!-- To allow XHR requests with the new Whitelist plugin -->
     <allow-navigation href="https://localhost" />
     <allow-navigation href="https://*.force.com" />

src/android/libs/SalesforceSDK/AndroidManifest.xml

@@ -34,12 +34,12 @@
             android:windowSoftInputMode="adjustResize"
             android:exported="true" />
 
-        <!-- Passcode activity -->
-        <activity android:name="com.salesforce.androidsdk.ui.PasscodeActivity"
+        <!-- Screen Lock Activity-->
+        <activity android:name="com.salesforce.androidsdk.ui.ScreenLockActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|stateAlwaysVisible"
-            android:theme="@style/SalesforceSDK.Passcode" />
+            android:theme="@style/SalesforceSDK.ScreenLock" />
 
         <!-- Manage space activity -->
         <activity android:name="com.salesforce.androidsdk.ui.ManageSpaceActivity"

src/android/libs/SalesforceSDK/build.gradle

@@ -11,14 +11,16 @@ dependencies {
     api project(':libs:SalesforceAnalytics')
     api 'com.squareup.okhttp3:okhttp:3.12.12'
     api 'com.google.firebase:firebase-messaging:20.1.0'
-    api 'androidx.core:core:1.3.2'
+    api 'androidx.core:core:1.6.0'
 
     /*
      * Don't upgrade browser library version until minApiVersion >= 24.
      * This is because the latest version of this library has minVersion = 24.
      */
     api 'androidx.browser:browser:1.0.0'
     implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.biometric:biometric:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

src/android/libs/SalesforceSDK/res/layout/sf__custom_server_url.xml

@@ -60,7 +60,7 @@
 			android:layout_marginEnd="10dp"
 			android:layout_marginBottom="10dp"
 			android:layout_weight="1"
-			android:background="@drawable/sf__passcode_secondary_color_button"
+			android:background="@drawable/sf__secondary_color_button"
 			android:text="@string/sf__server_url_default_cancel"
 			android:textAllCaps="false"
 			android:textColor="?attr/sfNegativeButtonTextColor"
@@ -78,7 +78,7 @@
 			android:layout_marginStart="10dp"
 			android:layout_marginEnd="20dp"
 			android:layout_marginBottom="10dp"
-			android:background="@drawable/sf__passcode_primary_color_button"
+			android:background="@drawable/sf__primary_color_button"
 			android:textColor="?attr/sfColorSecondary"
 			android:textAllCaps="false"
 			android:textSize="14sp"

src/android/libs/SalesforceSDK/res/layout/sf__login.xml

@@ -23,7 +23,7 @@
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginBottom="20dp"
-        android:background="@drawable/sf__passcode_primary_color_button"
+        android:background="@drawable/sf__primary_color_button"
         android:textColor="?attr/sfColorSecondary"
         android:textAllCaps="false"
         android:textSize="14sp"