Merge pull request #59 from NordicSemiconductor/develop

Fixed issue on pre-Lollipop devices
NordicSemiconductor · Nov 4, 2021 · 7bef549 · 7bef549
2 parents 3bd2a14 + e8488f9
commit 7bef549
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/app/src/main/java/no/nordicsemi/android/blinky/ScannerActivity.java b/app/src/main/java/no/nordicsemi/android/blinky/ScannerActivity.java
@@ -66,6 +66,12 @@ public class ScannerActivity extends AppCompatActivity implements DevicesAdapter
 
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
+        // The splash screen compat library does not work for pre-Lollipop devices
+        // so for them the theme needs to be set back to AppTheme.
+        // The AppTheme.SplashScreen theme will only be used to display the loading image.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            setTheme(R.style.AppTheme);
+        }
         super.onCreate(savedInstanceState);
 
         // Set up the splash screen.