From c2daa2fd2530a5cbc8226203ea8e744e809f05bc Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Tue, 27 Feb 2018 23:27:41 -0700
Subject: [PATCH] Taskbar 3.8.2 (release 4)

* Fix detection of SecondScreen disabling keyboard
---
 app/build.gradle                                                   | 4 ++--
 app/src/androidx86/AndroidManifest.xml                             | 2 +-
 .../main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java  | 1 -
 .../main/java/com/farmerbb/taskbar/service/StartMenuService.java   | 7 ++++++-
 app/src/main/java/com/farmerbb/taskbar/util/U.java                 | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6d63f7a7..4703df29 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 ext {
-    SUPPORT_LIBRARY_VERSION = "27.0.2"
+    SUPPORT_LIBRARY_VERSION = "27.1.0"
     SDK_VERSION = 27
 }
 
@@ -19,7 +19,7 @@ android {
         minSdkVersion 21
         targetSdkVersion SDK_VERSION
 
-        versionCode 180
+        versionCode 181
         versionName "3.8.2"
 
         resConfigs "en", "ja", "ru", "de", "zh-rCN"
diff --git a/app/src/androidx86/AndroidManifest.xml b/app/src/androidx86/AndroidManifest.xml
index 7d49ff87..e812ab4a 100644
--- a/app/src/androidx86/AndroidManifest.xml
+++ b/app/src/androidx86/AndroidManifest.xml
@@ -19,7 +19,7 @@
      * HomeActivity is enabled by default
      * SendSettingsReceiver and ReceiveSettingsReceiver are not exposed
 -->
-<manifest android:versionCode="180"
+<manifest android:versionCode="181"
           android:versionName="3.8.2"
           xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.farmerbb.taskbar" >
diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
index e91c62bc..5890270e 100644
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
@@ -70,7 +70,6 @@ public class AdvancedFragment extends SettingsFragment implements Preference.OnP
         findPreference("keyboard_shortcut").setSummary(DependencyUtils.getKeyboardShortcutSummary(getActivity()));
 
         if(!BuildConfig.APPLICATION_ID.equals(BuildConfig.ANDROIDX86_APPLICATION_ID)
-                && !U.hasSupportLibrary(getActivity())
                 && U.isPlayStoreInstalled(getActivity())) {
             findPreference("secondscreen").setOnPreferenceClickListener(this);
             secondScreenPrefEnabled = true;
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 0d180fb5..a22d1e74 100644
--- a/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
@@ -378,7 +378,7 @@ public class StartMenuService extends Service {
                 if(!hasHardwareKeyboard) {
                     ViewGroup.LayoutParams params1 = startMenu.getLayoutParams();
                     params1.height = getResources().getDimensionPixelSize(
-                            b && !U.isServiceRunning(this, "com.farmerbb.secondscreen.service.DisableKeyboardService")
+                            b && !isSecondScreenDisablingKeyboard()
                                     ? R.dimen.start_menu_height_half
                                     : R.dimen.start_menu_height);
                     startMenu.setLayoutParams(params1);
@@ -765,4 +765,9 @@ public class StartMenuService extends Service {
                 && pref.getBoolean("freeform_hack", false)
                 && !FreeformHackHelper.getInstance().isFreeformHackActive();
     }
+
+    private boolean isSecondScreenDisablingKeyboard() {
+        return Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD)
+                .startsWith("com.farmerbb.secondscreen");
+    }
 }
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 a8598d34..513ffc6b 100644
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -816,7 +816,7 @@ public class U {
         return isServiceRunning(context, cls.getName());
     }
 
-    public static boolean isServiceRunning(Context context, String className) {
+    private static boolean isServiceRunning(Context context, String className) {
         ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         for(ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
             if(className.equals(service.service.getClassName()))
-- 
2.11.0