Couple more fixes

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
index 5405de3..6d4a512 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
@@ -58,7 +58,6 @@ import com.farmerbb.taskbar.helper.GlobalHelper;
 import com.farmerbb.taskbar.util.Callbacks;
 import com.farmerbb.taskbar.util.TaskbarPosition;
 import com.farmerbb.taskbar.service.DashboardService;
-import com.farmerbb.taskbar.service.DisableKeyboardService;
 import com.farmerbb.taskbar.service.NotificationService;
 import com.farmerbb.taskbar.service.StartMenuService;
 import com.farmerbb.taskbar.service.TaskbarService;
@@ -247,10 +246,6 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
 
                 getApplicationContext().startActivity(homeIntent);
             }
-
-            if(U.getCurrentApiVersion() > 29.0 && !U.isLibrary(this)) {
-                U.setComponentEnabled(this, DisableKeyboardService.class, true);
-            }
         }
 
         shouldDelayFreeformHack = true;

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java b/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
index 73ee2a6..2d700e3 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
@@ -82,10 +82,12 @@ public abstract class UIController {
                 ViewParams newParams = isImeVisible ? params.updateBottomMargin(0) : params;
                 host.updateViewLayout(layout, newParams);
 
-                SharedPreferences pref = U.getSharedPreferences(context);
-                if(isImeFixDisabled() && !pref.getBoolean(PREF_DESKTOP_MODE_IME_FIX, false)) {
-                    pref.edit().putBoolean(PREF_DESKTOP_MODE_IME_FIX, true).apply();
-                    U.showToastLong(context, R.string.tb_desktop_mode_ime_fix_toast);
+                if(isImeFixDisabled() && !U.isLibrary(context)) {
+                    SharedPreferences pref = U.getSharedPreferences(context);
+                    if(!pref.getBoolean(PREF_DESKTOP_MODE_IME_FIX, false)) {
+                        pref.edit().putBoolean(PREF_DESKTOP_MODE_IME_FIX, true).apply();
+                        U.showToastLong(context, R.string.tb_desktop_mode_ime_fix_toast);
+                    }
                 }
             }