From 6608b66bfdc0cc34a16f9bfba52e3d38893d58e9 Mon Sep 17 00:00:00 2001 From: Braden Farmer Date: Fri, 15 May 2020 11:58:26 -0600 Subject: [PATCH] Few tweaks + fixes for desktop mode --- .../java/com/farmerbb/taskbar/ui/TaskbarController.java | 15 +++++++++++---- app/src/main/res/values-de/strings.xml | 3 +++ app/src/main/res/values-ja/strings.xml | 3 +++ app/src/main/res/values-nl/strings.xml | 3 +++ app/src/main/res/values-pl/strings.xml | 3 +++ app/src/main/res/values-ru/strings.xml | 3 +++ app/src/main/res/values-tr/strings.xml | 3 +++ app/src/main/res/values-zh-rCN/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 3 +++ 9 files changed, 35 insertions(+), 4 deletions(-) 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 d3fc26b6..104f88f5 100644 --- a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java +++ b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java @@ -653,14 +653,16 @@ public class TaskbarController extends UIController { if(!U.isLibrary(context)) { sysTrayLayout.setOnClickListener(v -> { - U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS); + U.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS, + () -> 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.sendAccessibilityAction(context, AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS, + () -> U.showToast(context, R.string.tb_opening_quick_settings)); if(U.shouldCollapse(context, false)) hideTaskbar(true); @@ -801,7 +803,9 @@ public class TaskbarController extends UIController { for(AppEntry packageInfo : usageStatsList) { if(hasLauncherIntent(packageInfo.getPackageName()) && !packageInfo.getPackageName().contains(BuildConfig.BASE_APPLICATION_ID) - && !packageInfo.getPackageName().equals(defaultLauncher.activityInfo.packageName)) + && !packageInfo.getPackageName().equals(defaultLauncher.activityInfo.packageName) + && (!(U.launcherIsDefault(context) && pref.getBoolean(PREF_DESKTOP_MODE, false)) + || !packageInfo.getPackageName().equals(pref.getString(PREF_HSL_ID, "null")))) usageStatsList2.add(packageInfo); } @@ -1158,7 +1162,10 @@ public class TaskbarController extends UIController { private void toggleTaskbar(boolean userInitiated) { if(userInitiated && Build.BRAND.equalsIgnoreCase("essential")) { SharedPreferences pref = U.getSharedPreferences(context); - if(!pref.getBoolean(PREF_GRIP_REJECTION_TOAST_SHOWN, false)) { + LauncherHelper helper = LauncherHelper.getInstance(); + + if(!pref.getBoolean(PREF_GRIP_REJECTION_TOAST_SHOWN, false) + && !helper.isOnSecondaryHomeScreen()) { U.showToastLong(context, R.string.tb_essential_phone_grip_rejection); pref.edit().putBoolean(PREF_GRIP_REJECTION_TOAST_SHOWN, true).apply(); } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 746a0e1a..3603c37c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -452,4 +452,7 @@ Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 50e4714f..9979ce15 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -452,4 +452,7 @@ Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + \ 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 fd8788f6..63985fd2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -452,4 +452,7 @@ Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a96209a6..e4e3b0bc 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -469,4 +469,7 @@ W takim przypadku może być konieczne flashowanie niestandardowego ROM-u w celu Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + \ 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 8112f3dd..f8fe318e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -452,4 +452,7 @@ Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + \ 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 59285d3f..650e5f5d 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -444,4 +444,7 @@ Bu durumda, bu cihazdaki serbest biçimli modu kullanmak için özel bir ROM fla Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + \ 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 0089e879..03ffe68a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -452,4 +452,7 @@ Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + \ 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 cb170347..3985e7f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -452,4 +452,7 @@ Hide app icon labels + Opening notification tray on primary display + Opening quick settings on primary display + -- 2.11.0