6 files changed, 11 insertions, 6 deletions
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index a39486d..9f95519 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -435,7 +435,7 @@ public final class Config
       case 1:
       default: break;
     }
-    e.commit();
+    e.apply();
   }
 
   private static LayoutsPreference.Layout migrate_layout(String name)
diff --git a/srcs/juloo.keyboard2/DirectBootAwarePreferences.java b/srcs/juloo.keyboard2/DirectBootAwarePreferences.java
index fcc67c6..df1612e 100644
--- a/srcs/juloo.keyboard2/DirectBootAwarePreferences.java
+++ b/srcs/juloo.keyboard2/DirectBootAwarePreferences.java
@@ -59,7 +59,7 @@ public final class DirectBootAwarePreferences
       // Device is locked, migrate later.
       return;
     }
-    prefs.edit().putBoolean("need_migration", false).commit();
+    prefs.edit().putBoolean("need_migration", false).apply();
     copy_shared_preferences(prefs, protected_prefs);
   }
 
@@ -83,6 +83,6 @@ public final class DirectBootAwarePreferences
       else if (v instanceof Set)
         e.putStringSet(k, (Set<String>)v);
     }
-    e.commit();
+    e.apply();
   }
 }
diff --git a/srcs/juloo.keyboard2/KeyEventHandler.java b/srcs/juloo.keyboard2/KeyEventHandler.java
index 51d4385..65de779 100644
--- a/srcs/juloo.keyboard2/KeyEventHandler.java
+++ b/srcs/juloo.keyboard2/KeyEventHandler.java
@@ -1,5 +1,6 @@
 package juloo.keyboard2;
 
+import android.annotation.SuppressLint;
 import android.os.Looper;
 import android.text.InputType;
 import android.view.KeyEvent;
@@ -197,6 +198,7 @@ public final class KeyEventHandler implements Config.IKeyEventHandler
     conn.performContextMenuAction(id);
   }
 
+  @SuppressLint("InlinedApi")
   void handle_editing_key(KeyValue.Editing ev)
   {
     switch (ev)
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index 42c93ca..fb95412 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -77,12 +77,14 @@ public class Keyboard2View extends View
       return;
     // The intermediate Window is a [Dialog].
     Window w = getParentWindow(context);
+    w.setNavigationBarColor(_theme.colorNavBar);
+    if (VERSION.SDK_INT < 26)
+      return;
     int uiFlags = getSystemUiVisibility();
     if (_theme.isLightNavBar)
       uiFlags |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
     else
       uiFlags &= ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-    w.setNavigationBarColor(_theme.colorNavBar);
     setSystemUiVisibility(uiFlags);
   }
 
diff --git a/srcs/juloo.keyboard2/Utils.java b/srcs/juloo.keyboard2/Utils.java
index 712c83d..f0f3036 100644
--- a/srcs/juloo.keyboard2/Utils.java
+++ b/srcs/juloo.keyboard2/Utils.java
@@ -6,6 +6,7 @@ import android.view.Window;
 import android.view.WindowManager;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.util.Locale;
 
 public final class Utils
 {
@@ -16,7 +17,7 @@ public final class Utils
       return s;
     // Make sure not to cut a code point in half
     int i = s.offsetByCodePoints(0, 1);
-    return s.substring(0, i).toUpperCase() + s.substring(i);
+    return s.substring(0, i).toUpperCase(Locale.getDefault()) + s.substring(i);
   }
 
   /** Like [dialog.show()] but properly configure layout params when called
diff --git a/srcs/juloo.keyboard2/VoiceImeSwitcher.java b/srcs/juloo.keyboard2/VoiceImeSwitcher.java
index 56bd33d..d228130 100644
--- a/srcs/juloo.keyboard2/VoiceImeSwitcher.java
+++ b/srcs/juloo.keyboard2/VoiceImeSwitcher.java
@@ -65,7 +65,7 @@ class VoiceImeSwitcher
           prefs.edit()
             .putString(PREF_LAST_USED, selected.get_id())
             .putString(PREF_KNOWN_IMES, serialize_ime_ids(imes))
-            .commit();
+            .apply();
           switch_input_method(ims, selected);
         }
       })