Update freeform mode onboarding for O DP3

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
index 85c730e..ef08e76 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
@@ -82,7 +82,7 @@ public class FreeformModeFragment extends SettingsFragment implements Preference
             if(!pref.getBoolean("samsung_dialog_shown", false)) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
                 builder.setTitle(R.string.samsung_freeform_title)
-                        .setMessage(U.isOPreview() ? R.string.o_preview_freeform_message : R.string.samsung_freeform_message)
+                        .setMessage(R.string.samsung_freeform_message)
                         .setPositiveButton(R.string.action_ok, (dialog, which) -> pref.edit().putBoolean("samsung_dialog_shown", true).apply());
 
                 AlertDialog dialog = builder.create();
@@ -103,11 +103,7 @@ public class FreeformModeFragment extends SettingsFragment implements Preference
         if(showReminderToast) {
             showReminderToast = false;
 
-            ((CheckBoxPreference) findPreference("freeform_hack")).setChecked(U.hasFreeformSupport(getActivity()));
-
-            if(U.hasFreeformSupport(getActivity())) {
-                U.showToastLong(getActivity(), R.string.reboot_required);
-            }
+            freeformSetupComplete();
         }
     }
 
@@ -134,23 +130,29 @@ public class FreeformModeFragment extends SettingsFragment implements Preference
                             ((CheckBoxPreference) p).setChecked(false);
 
                             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-                            builder.setTitle(R.string.freeform_dialog_title)
-                                    .setMessage(R.string.freeform_dialog_message)
-                                    .setPositiveButton(R.string.action_developer_options, (dialogInterface, i) -> {
-                                        showReminderToast = true;
-
-                                        Intent intent = new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
-                                        try {
-                                            startActivity(intent);
-                                            U.showToastLong(getActivity(), R.string.enable_force_activities_resizable);
-                                        } catch (ActivityNotFoundException e1) {
-                                            intent = new Intent(Settings.ACTION_DEVICE_INFO_SETTINGS);
+                            if(Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) {
+                                builder.setTitle(R.string.freeform_dialog_title)
+                                        .setMessage(R.string.freeform_dialog_message_alt)
+                                        .setPositiveButton(R.string.action_ok, (dialogInterface, i) -> freeformSetupComplete());
+                            } else {
+                                builder.setTitle(R.string.freeform_dialog_title)
+                                        .setMessage(R.string.freeform_dialog_message)
+                                        .setPositiveButton(R.string.action_developer_options, (dialogInterface, i) -> {
+                                            showReminderToast = true;
+
+                                            Intent intent = new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
                                             try {
                                                 startActivity(intent);
-                                                U.showToastLong(getActivity(), R.string.enable_developer_options);
-                                            } catch (ActivityNotFoundException e2) { /* Gracefully fail */ }
-                                        }
-                                    });
+                                                U.showToastLong(getActivity(), R.string.enable_force_activities_resizable);
+                                            } catch (ActivityNotFoundException e1) {
+                                                intent = new Intent(Settings.ACTION_DEVICE_INFO_SETTINGS);
+                                                try {
+                                                    startActivity(intent);
+                                                    U.showToastLong(getActivity(), R.string.enable_developer_options);
+                                                } catch (ActivityNotFoundException e2) { /* Gracefully fail */ }
+                                            }
+                                        });
+                            }
 
                             AlertDialog dialog = builder.create();
                             dialog.show();
@@ -203,4 +205,12 @@ public class FreeformModeFragment extends SettingsFragment implements Preference
 
         return true;
     }
+
+    private void freeformSetupComplete() {
+        ((CheckBoxPreference) findPreference("freeform_hack")).setChecked(U.hasFreeformSupport(getActivity()));
+
+        if(U.hasFreeformSupport(getActivity())) {
+            U.showToastLong(getActivity(), R.string.reboot_required);
+        }
+    }
 }

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 9e11be6..2da2985 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -814,7 +814,7 @@ public class U {
     }
 
     public static boolean hasPartialFreeformSupport() {
-         return Build.MANUFACTURER.equalsIgnoreCase("Samsung") || isOPreview();
+         return Build.MANUFACTURER.equalsIgnoreCase("Samsung");
     }
 
     public static boolean isServiceRunning(Context context, Class<? extends Service> cls) {

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8570d0d..9f26a9b 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -307,7 +307,6 @@
 
     <string name="samsung_freeform_title">Note</string>
     <string name="samsung_freeform_message">Freeform mode does not work on Samsung devices, due to system changes made to multi-window mode.\n\nYou may need to flash a custom ROM in order to use freeform mode on this device.</string>
-    <string name="o_preview_freeform_message">Freeform mode has issues on devices with Android O, due to system changes made to multi-window mode.\n\nFor maximum compatibility, please clear all fullscreen apps from recents before opening any freeform windows.</string>
 
     <string name="widget_restore_toast">Select \"%1$s\" to restore this widget</string>
 
@@ -319,4 +318,6 @@
 
     <string name="press_enter_alt">@string/press_enter</string>
 
+    <string name="freeform_dialog_message_alt">In order for Taskbar to launch apps in freeform window mode, please follow these steps:\n\n&#8226; Go to Developer Options and enable USB debugging\n\n&#8226; Connect your device to a computer with the Android SDK installed, and run the following adb shell command:\n\nsettings put global enable_freeform_support 1\n\n&#8226; Reboot your device</string>
+
 </resources>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 69a13aa..bc28707 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -307,7 +307,6 @@
 
     <string name="samsung_freeform_title">注意</string>
     <string name="samsung_freeform_message">マルチウィンドウモードのシステム変更により、フリーフォームモードが Samsung デバイスで動作しない可能性があります。\n\nこのデバイスでフリーフォームモードを使用するにはカスタム ROM をフラッシュする必要があります。</string>
-    <string name="o_preview_freeform_message">Freeform mode has issues on devices with Android O, due to system changes made to multi-window mode.\n\nFor maximum compatibility, please clear all fullscreen apps from recents before opening any freeform windows.</string>
 
     <string name="widget_restore_toast">\"%1$s\" を選択してこのウィジェットを復元します</string>
 
@@ -319,4 +318,6 @@
 
     <string name="press_enter_alt">@string/press_enter</string>
 
+    <string name="freeform_dialog_message_alt">In order for Taskbar to launch apps in freeform window mode, please follow these steps:\n\n&#8226; Go to Developer Options and enable USB debugging\n\n&#8226; Connect your device to a computer with the Android SDK installed, and run the following adb shell command:\n\nsettings put global enable_freeform_support 1\n\n&#8226; Reboot your device</string>
+
 </resources>

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c8e3a1a..e8b3e58 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -307,7 +307,6 @@
 
     <string name="samsung_freeform_title">Внимание</string>
     <string name="samsung_freeform_message">Freeform имеет проблемы с устройствами Samsung из-за изменений в работе мультизадачности.\n\nВам потребуеться прошить сторонее ПО для работы Freeform.</string>
-    <string name="o_preview_freeform_message">Freeform mode has issues on devices with Android O, due to system changes made to multi-window mode.\n\nFor maximum compatibility, please clear all fullscreen apps from recents before opening any freeform windows.</string>
 
     <string name="widget_restore_toast">Select \"%1$s\" to restore this widget</string>
 
@@ -319,4 +318,6 @@
 
     <string name="press_enter_alt">@string/press_enter</string>
 
+    <string name="freeform_dialog_message_alt">In order for Taskbar to launch apps in freeform window mode, please follow these steps:\n\n&#8226; Go to Developer Options and enable USB debugging\n\n&#8226; Connect your device to a computer with the Android SDK installed, and run the following adb shell command:\n\nsettings put global enable_freeform_support 1\n\n&#8226; Reboot your device</string>
+
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d00d208..49dca87 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -307,7 +307,6 @@
 
     <string name="samsung_freeform_title">Note</string>
     <string name="samsung_freeform_message">Freeform mode does not work on Samsung devices, due to system changes made to multi-window mode.\n\nYou may need to flash a custom ROM in order to use freeform mode on this device.</string>
-    <string name="o_preview_freeform_message">Freeform mode has issues on devices with Android O, due to system changes made to multi-window mode.\n\nFor maximum compatibility, please clear all fullscreen apps from recents before opening any freeform windows.</string>
 
     <string name="widget_restore_toast">Select \"%1$s\" to restore this widget</string>
 
@@ -319,4 +318,6 @@
 
     <string name="press_enter_alt">No apps found\n\nPress Enter to open in browser</string>
 
+    <string name="freeform_dialog_message_alt">In order for Taskbar to launch apps in freeform window mode, please follow these steps:\n\n&#8226; Go to Developer Options and enable USB debugging\n\n&#8226; Connect your device to a computer with the Android SDK installed, and run the following adb shell command:\n\nsettings put global enable_freeform_support 1\n\n&#8226; Reboot your device</string>
+
 </resources>