From: utzcoz <utzcoz@outlook.com>
Date: Sun, 19 Jul 2020 11:25:25 +0000 (+0800)
Subject: Extract context_menu_fix to constant
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1a56b3b112cd702ec87f85df090bed0d6adfd959;p=android-x86%2Fpackages-apps-Taskbar.git

Extract context_menu_fix to constant

Test: ./gradlew test

Signed-off-by: utzcoz <utzcoz@outlook.com>
---

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 be658be5..5f96869c 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -111,7 +111,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
         showStartMenu = args.getBoolean("launched_from_start_menu", false);
         isStartButton = entry == null && args.getBoolean("is_start_button", false);
         isOverflowMenu = entry == null && args.getBoolean("is_overflow_menu", false);
-        contextMenuFix = args.containsKey("context_menu_fix");
+        contextMenuFix = args.containsKey(EXTRA_CONTEXT_MENU_FIX);
         showQuitOption = !args.getBoolean("dont_show_quit", false);
 
         // Determine where to position the dialog on screen
diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java
index d27da6a3..5cc108d6 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java
@@ -125,7 +125,7 @@ public class DashboardActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        contextMenuFix = getIntent().hasExtra("context_menu_fix");
+        contextMenuFix = getIntent().hasExtra(EXTRA_CONTEXT_MENU_FIX);
 
         // Detect outside touches, and finish the activity when one is detected
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java b/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
index 6dd18938..58609557 100644
--- a/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
@@ -319,13 +319,15 @@ public class DashboardController extends UIController {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
 
-            if(inFreeformMode) {
-                if(U.hasBrokenSetLaunchBoundsApi())
-                    intent.putExtra("context_menu_fix", true);
+            if (inFreeformMode) {
+                if (U.hasBrokenSetLaunchBoundsApi()) {
+                    intent.putExtra(EXTRA_CONTEXT_MENU_FIX, true);
+                }
 
                 U.startActivityMaximized(context, intent);
-            } else
+            } else {
                 context.startActivity(intent);
+            }
 
             for(int i = 0; i < maxSize; i++) {
                 final DashboardCell cellLayout = cells.get(i);
diff --git a/app/src/main/java/com/farmerbb/taskbar/util/Constants.java b/app/src/main/java/com/farmerbb/taskbar/util/Constants.java
index 5408c5db..cec0db51 100644
--- a/app/src/main/java/com/farmerbb/taskbar/util/Constants.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/Constants.java
@@ -245,4 +245,5 @@ public class Constants {
     public static final String EXTRA_IS_LAUNCHING_SHORTCUT = "is_launching_shortcut";
     public static final String EXTRA_APPWIDGET_ID = "appWidgetId";
     public static final String EXTRA_CELL_ID = "cellId";
+    public static final String EXTRA_CONTEXT_MENU_FIX = "context_menu_fix";
 }
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 c1d55399..983fa07a 100644
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -668,8 +668,9 @@ public class U {
         if(hasFreeformSupport(context) && FreeformHackHelper.getInstance().isInFreeformWorkspace()) {
             DisplayInfo display = getDisplayInfo(context);
 
-            if(hasBrokenSetLaunchBoundsApi())
-                intent.putExtra("context_menu_fix", true);
+            if (hasBrokenSetLaunchBoundsApi()) {
+                intent.putExtra(EXTRA_CONTEXT_MENU_FIX, true);
+            }
 
             context.startActivity(intent,
                     getActivityOptionsBundle(context, ApplicationType.CONTEXT_MENU, null,