From 405dbe56d68550ef5f4f76777ff68b70fb7d8ba4 Mon Sep 17 00:00:00 2001 From: Braden Farmer Date: Sun, 30 Jul 2017 22:06:51 -0600 Subject: [PATCH] Replace U.isOPreview() with BUILD.VERSION checks --- .../com/farmerbb/taskbar/activity/ContextMenuActivity.java | 2 +- .../com/farmerbb/taskbar/adapter/StartMenuAdapter.java | 4 ++-- .../farmerbb/taskbar/fragment/FreeformModeFragment.java | 2 +- .../com/farmerbb/taskbar/service/DashboardService.java | 2 +- .../com/farmerbb/taskbar/service/StartMenuService.java | 7 +++++-- .../java/com/farmerbb/taskbar/service/TaskbarService.java | 4 ++-- app/src/main/java/com/farmerbb/taskbar/util/U.java | 14 +++++--------- 7 files changed, 17 insertions(+), 18 deletions(-) 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 c8d801bc..a66803fa 100644 --- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java +++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java @@ -466,7 +466,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc case "show_window_sizes": generateWindowSizes(); - if(U.isOPreview()) { + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { U.showToast(this, R.string.window_sizes_not_available); } diff --git a/app/src/main/java/com/farmerbb/taskbar/adapter/StartMenuAdapter.java b/app/src/main/java/com/farmerbb/taskbar/adapter/StartMenuAdapter.java index 6d59870f..84d83d8a 100644 --- a/app/src/main/java/com/farmerbb/taskbar/adapter/StartMenuAdapter.java +++ b/app/src/main/java/com/farmerbb/taskbar/adapter/StartMenuAdapter.java @@ -190,7 +190,7 @@ public class StartMenuAdapter extends ArrayAdapter { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && FreeformHackHelper.getInstance().isInFreeformWorkspace()) { DisplayMetrics metrics = U.getRealDisplayMetrics(getContext()); - if(intent != null && U.isOPreview()) + if(intent != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) intent.putExtra("context_menu_fix", true); getContext().startActivity(intent, U.getActivityOptions(ApplicationType.CONTEXT_MENU).setLaunchBounds(new Rect(0, 0, metrics.widthPixels, metrics.heightPixels)).toBundle()); @@ -208,6 +208,6 @@ public class StartMenuAdapter extends ArrayAdapter { private boolean visualFeedbackEnabled() { SharedPreferences pref = U.getSharedPreferences(getContext()); - return !U.isOPreview() && pref.getBoolean("visual_feedback", true); + return Build.VERSION.SDK_INT < Build.VERSION_CODES.O && pref.getBoolean("visual_feedback", true); } } 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 c9837c6c..f8729683 100644 --- a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java +++ b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java @@ -222,7 +222,7 @@ public class FreeformModeFragment extends SettingsFragment implements Preference } break; case "window_size": - if(U.isOPreview()) { + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { U.showToast(getActivity(), R.string.window_sizes_not_available); } diff --git a/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java b/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java index dbf12e24..eda82c41 100644 --- a/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java +++ b/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java @@ -348,7 +348,7 @@ public class DashboardService extends Service { } if(inFreeformMode) { - if(intent != null && U.isOPreview()) + if(intent != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) intent.putExtra("context_menu_fix", true); U.launchAppMaximized(this, intent); 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 a5a48f08..98be1bec 100644 --- a/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java +++ b/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java @@ -613,7 +613,10 @@ public class StartMenuService extends Service { boolean inFreeformMode = FreeformHackHelper.getInstance().isInFreeformWorkspace(); if(!onHomeScreen || inFreeformMode) { - Class clazz = inFreeformMode && !U.isOPreview() ? InvisibleActivityAlt.class : InvisibleActivity.class; + Class clazz = inFreeformMode && Build.VERSION.SDK_INT < Build.VERSION_CODES.O + ? InvisibleActivityAlt.class + : InvisibleActivity.class; + Intent intent = new Intent(this, clazz); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); @@ -722,7 +725,7 @@ public class StartMenuService extends Service { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && FreeformHackHelper.getInstance().isInFreeformWorkspace()) { DisplayMetrics metrics = U.getRealDisplayMetrics(this); - if(intent != null && U.isOPreview()) + if(intent != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) intent.putExtra("context_menu_fix", true); startActivity(intent, U.getActivityOptions(ApplicationType.CONTEXT_MENU).setLaunchBounds(new Rect(0, 0, metrics.widthPixels, metrics.heightPixels)).toBundle()); diff --git a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java index 68405154..75095f5e 100644 --- a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java +++ b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java @@ -1139,7 +1139,7 @@ public class TaskbarService extends Service { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && FreeformHackHelper.getInstance().isInFreeformWorkspace()) { DisplayMetrics metrics = U.getRealDisplayMetrics(this); - if(intent != null && U.isOPreview()) + if(intent != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) intent.putExtra("context_menu_fix", true); startActivity(intent, U.getActivityOptions(ApplicationType.CONTEXT_MENU).setLaunchBounds(new Rect(0, 0, metrics.widthPixels, metrics.heightPixels)).toBundle()); @@ -1284,7 +1284,7 @@ public class TaskbarService extends Service { if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && FreeformHackHelper.getInstance().isInFreeformWorkspace()) { DisplayMetrics metrics = U.getRealDisplayMetrics(this); - if(intent != null && U.isOPreview()) + if(intent != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) intent.putExtra("context_menu_fix", true); startActivity(intent, U.getActivityOptions(ApplicationType.CONTEXT_MENU).setLaunchBounds(new Rect(0, 0, metrics.widthPixels, metrics.heightPixels)).toBundle()); 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 9fdf247c..0ff57f20 100644 --- a/app/src/main/java/com/farmerbb/taskbar/util/U.java +++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java @@ -248,7 +248,8 @@ public class U { SharedPreferences pref = getSharedPreferences(context); FreeformHackHelper helper = FreeformHackHelper.getInstance(); - boolean specialLaunch = isOPreview() && FreeformHackHelper.getInstance().isInFreeformWorkspace() + boolean specialLaunch = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + && FreeformHackHelper.getInstance().isInFreeformWorkspace() && MenuHelper.getInstance().isContextMenuOpen(); if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N @@ -300,8 +301,7 @@ public class U { intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); if(FreeformHackHelper.getInstance().isInFreeformWorkspace() - && Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1 - && !isOPreview()) + && Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1) intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME); if(launchedFromTaskbar) { @@ -892,7 +892,8 @@ public class U { stackId = FREEFORM_WORKSPACE_STACK_ID; break; case CONTEXT_MENU: - if(isOPreview()) stackId = FULLSCREEN_WORKSPACE_STACK_ID; + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + stackId = FULLSCREEN_WORKSPACE_STACK_ID; } if(stackId != null) { @@ -919,11 +920,6 @@ public class U { } } - @TargetApi(Build.VERSION_CODES.M) - public static boolean isOPreview() { - return (Build.VERSION.SDK_INT > Build.VERSION_CODES.N_MR1) || (Build.VERSION.RELEASE.equals("O") && Build.VERSION.PREVIEW_SDK_INT > 0); - } - public static boolean isChromeOs(Context context) { return context.getPackageManager().hasSystemFeature("org.chromium.arc"); } -- 2.11.0