Taskbar 4.0.1 (release 3)

* Fix context menu bug

diff --git a/app/build.gradle b/app/build.gradle
index 0942b9b..cb59f2d 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
         targetSdkVersion SDK_VERSION
 
         // TODO keep versionName and versionCode in sync with Android-x86 manifest
-        versionCode 191
+        versionCode 192
         versionName "4.0.1"
 
         resConfigs "en", "ja", "ru", "de", "zh-rCN", "tr", "nl"

diff --git a/app/src/androidx86/AndroidManifest.xml b/app/src/androidx86/AndroidManifest.xml
index 6ade18f..a1d87f7 100644 (file)
--- a/app/src/androidx86/AndroidManifest.xml
+++ b/app/src/androidx86/AndroidManifest.xml
@@ -19,7 +19,7 @@
      * HomeActivity is enabled by default
      * Certain activities and receivers are not exposed
 -->
-<manifest android:versionCode="191"
+<manifest android:versionCode="192"
           android:versionName="4.0.1"
           xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.farmerbb.taskbar" >

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index 1d72cf4..5d63c10 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -227,15 +227,19 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
 
     @SuppressWarnings("deprecation")
     private void generateMenu() {
+        SharedPreferences pref = U.getSharedPreferences(this);
+
         if(isStartButton) {
             addPreferencesFromResource(R.xml.pref_context_menu_open_settings);
             findPreference("open_taskbar_settings").setOnPreferenceClickListener(this);
             findPreference("start_menu_apps").setOnPreferenceClickListener(this);
 
-            if((U.launcherIsDefault(this)
+            if(pref.getBoolean("freeform_hack", false)
+                    && ((U.launcherIsDefault(this)
+                    && !U.isOverridingFreeformHack(this)
                     && FreeformHackHelper.getInstance().isInFreeformWorkspace())
                     || (U.isOverridingFreeformHack(this)
-                    && LauncherHelper.getInstance().isOnHomeScreen())) {
+                    && LauncherHelper.getInstance().isOnHomeScreen()))) {
                 addPreferencesFromResource(R.xml.pref_context_menu_change_wallpaper);
                 findPreference("change_wallpaper").setOnPreferenceClickListener(this);
             }
@@ -277,7 +281,6 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                 findPreference("header").setTitle(appName);
             }
 
-            SharedPreferences pref = U.getSharedPreferences(this);
             if(U.hasFreeformSupport(this)
                     && pref.getBoolean("freeform_hack", false)
                     && !U.isGame(this, packageName)) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
index c23f0f6..77bcc24 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
@@ -159,9 +159,6 @@ public class InvisibleActivityFreeform extends Activity {
     protected void onResume() {
         super.onResume();
 
-        if(!proceedWithOnCreate)
-            return;
-
         // Show the taskbar when activity is resumed (no other freeform windows are active)
         if(showTaskbar)
             LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.SHOW_TASKBAR"));
@@ -190,9 +187,6 @@ public class InvisibleActivityFreeform extends Activity {
     protected void onStart() {
         super.onStart();
 
-        if(!proceedWithOnCreate)
-            return;
-
         FreeformHackHelper.getInstance().setInFreeformWorkspace(true);
 
         if(U.launcherIsDefault(this) && !U.isChromeOs(this)) {
@@ -237,9 +231,6 @@ public class InvisibleActivityFreeform extends Activity {
     protected void onPause() {
         super.onPause();
 
-        if(!proceedWithOnCreate)
-            return;
-
         possiblyHideTaskbar();
     }
 
@@ -247,9 +238,6 @@ public class InvisibleActivityFreeform extends Activity {
     protected void onStop() {
         super.onStop();
 
-        if(!proceedWithOnCreate)
-            return;
-
         if(!finish)
             FreeformHackHelper.getInstance().setInFreeformWorkspace(false);