Miscellaneous fixes

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java b/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
index 2bf46b5..fdd969a 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
@@ -178,7 +178,7 @@ public class StartMenuService extends Service {
         super.onCreate();
 
         hasHardwareKeyboard = getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
-        applySoftKeyboardFix = hasHardwareKeyboard && U.isChromeOs(this);
+        applySoftKeyboardFix = hasHardwareKeyboard /* && U.isChromeOs(this) */ ;
 
         SharedPreferences pref = U.getSharedPreferences(this);
         if(pref.getBoolean("taskbar_active", false) || LauncherHelper.getInstance().isOnHomeScreen()) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index 44dcb26..134aed4 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -194,18 +194,20 @@ public class U {
 
         if(!isAccessibilityServiceEnabled
                 && hasWriteSecureSettingsPermission(context)) {
-            String notificationServices = Settings.Secure.getString(context.getContentResolver(),
+            String services = Settings.Secure.getString(context.getContentResolver(),
                     Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
 
+            String finalServices = services == null ? "" : services;
+
             String powerMenuService = new ComponentName(context, PowerMenuService.class).flattenToString();
 
-            if(!notificationServices.contains(powerMenuService)) {
+            if(!finalServices.contains(powerMenuService)) {
                 try {
                     Settings.Secure.putString(context.getContentResolver(),
                             Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                            notificationServices.isEmpty()
+                            finalServices.isEmpty()
                                     ? powerMenuService
-                                    : notificationServices + ":" + powerMenuService);
+                                    : finalServices + ":" + powerMenuService);
                 } catch (Exception e) { /* Gracefully fail */ }
             }
 
@@ -217,7 +219,7 @@ public class U {
                 try {
                     Settings.Secure.putString(context.getContentResolver(),
                             Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,
-                            notificationServices);
+                            finalServices);
                 } catch (Exception e) { /* Gracefully fail */ }
 
                 if(onComplete != null) onComplete.run();