Show more toasts when performing actions that can't be done on secondary displays

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 6d82eb4..9502dc4 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -614,6 +614,9 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                 AudioManager audio = (AudioManager) getSystemService(AUDIO_SERVICE);
                 audio.adjustSuggestedStreamVolume(AudioManager.ADJUST_SAME, AudioManager.USE_DEFAULT_STREAM_TYPE, AudioManager.FLAG_SHOW_UI);
 
+                if(LauncherHelper.getInstance().isOnSecondaryHomeScreen())
+                    U.showToast(this, R.string.tb_opening_volume_control);
+
                 showStartMenu = false;
                 shouldHideTaskbar = true;
                 contextMenuFix = false;
@@ -672,7 +675,10 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                 contextMenuFix = false;
                 break;
             case "power_menu":
-                U.sendAccessibilityAction(this, AccessibilityService.GLOBAL_ACTION_POWER_DIALOG);
+                U.sendAccessibilityAction(this, AccessibilityService.GLOBAL_ACTION_POWER_DIALOG, () -> {
+                    if(LauncherHelper.getInstance().isOnSecondaryHomeScreen())
+                        U.showToast(this, R.string.tb_opening_power_menu);
+                });
 
                 showStartMenu = false;
                 shouldHideTaskbar = true;

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
index f131546..ccb679b 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
@@ -648,16 +648,22 @@ public class TaskbarController extends UIController {
 
         if(!U.isLibrary(context)) {
             sysTrayLayout.setOnClickListener(v -> {
-                U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS,
-                        () -> U.showToast(context, R.string.tb_opening_notification_tray));
+                U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS, () -> {
+                    if(LauncherHelper.getInstance().isOnSecondaryHomeScreen())
+                        U.showToast(context, R.string.tb_opening_notification_tray);
+                });
+
                 if(U.shouldCollapse(context, false))
                     hideTaskbar(true);
             });
 
             if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 sysTrayLayout.setOnLongClickListener(v -> {
-                    U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS,
-                            () -> U.showToast(context, R.string.tb_opening_quick_settings));
+                    U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS, () -> {
+                        if(LauncherHelper.getInstance().isOnSecondaryHomeScreen())
+                            U.showToast(context, R.string.tb_opening_quick_settings);
+                    });
+
                     if(U.shouldCollapse(context, false))
                         hideTaskbar(true);
 
@@ -667,8 +673,11 @@ public class TaskbarController extends UIController {
                 sysTrayLayout.setOnGenericMotionListener((view, motionEvent) -> {
                     if(motionEvent.getAction() == MotionEvent.ACTION_BUTTON_PRESS
                             && motionEvent.getButtonState() == MotionEvent.BUTTON_SECONDARY) {
-                        U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS,
-                                () -> U.showToast(context, R.string.tb_opening_quick_settings));
+                        U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS, () -> {
+                            if(LauncherHelper.getInstance().isOnSecondaryHomeScreen())
+                                U.showToast(context, R.string.tb_opening_quick_settings);
+                        });
+
                         if(U.shouldCollapse(context, false))
                             hideTaskbar(true);
                     }

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3603c37..17713e7 100644 (file)
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -452,7 +452,9 @@
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9979ce1..8ae4d5d 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -452,7 +452,9 @@
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 63985fd..b8f0e83 100644 (file)
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -452,7 +452,9 @@
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e4e3b0b..7377131 100644 (file)
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -469,7 +469,9 @@ W takim przypadku może być konieczne flashowanie niestandardowego ROM-u w celu
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f8fe318..10287c0 100644 (file)
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -452,7 +452,9 @@
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 650e5f5..88e9439 100644 (file)
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -444,7 +444,9 @@ Bu durumda, bu cihazdaki serbest biçimli modu kullanmak için özel bir ROM fla
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 03ffe68..69fb589 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -452,7 +452,9 @@
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3985e7f..3483e76 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -452,7 +452,9 @@
 
     <string name="tb_hide_icon_labels">Hide app icon labels</string>
 
-    <string name="tb_opening_notification_tray">Opening notification tray on primary display</string>
-    <string name="tb_opening_quick_settings">Opening quick settings on primary display</string>
+    <string name="tb_opening_notification_tray">Opened notification tray on primary display</string>
+    <string name="tb_opening_quick_settings">Opened quick settings on primary display</string>
+    <string name="tb_opening_volume_control">Opened volume control on primary display</string>
+    <string name="tb_opening_power_menu">Opened power menu on primary display</string>
 
 </resources>