OSDN Git Service

Extract START_MENU_APPEARING string to TaskbarIntent.ACTION_START_MENU_APPEARING
authorutzcoz <utzcoz@outlook.com>
Fri, 20 Mar 2020 06:41:36 +0000 (14:41 +0800)
committerutzcoz <utzcoz@outlook.com>
Fri, 20 Mar 2020 06:41:36 +0000 (14:41 +0800)
Signed-off-by: utzcoz <utzcoz@outlook.com>
app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java
app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java

index 3aba1c9..4dab4c9 100644 (file)
@@ -237,7 +237,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
         generateMenu();
 
         IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction("com.farmerbb.taskbar.START_MENU_APPEARING");
+        intentFilter.addAction(TaskbarIntent.ACTION_START_MENU_APPEARING);
         intentFilter.addAction("com.farmerbb.taskbar.DASHBOARD_APPEARING");
 
         LocalBroadcastManager.getInstance(this).registerReceiver(dashboardOrStartMenuAppearingReceiver, intentFilter);
index 7c0dd3d..21b49bf 100644 (file)
@@ -109,7 +109,7 @@ public class InvisibleActivityFreeform extends Activity {
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH, WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);
 
         IntentFilter appearingReceiverFilter = new IntentFilter();
-        appearingReceiverFilter.addAction("com.farmerbb.taskbar.START_MENU_APPEARING");
+        appearingReceiverFilter.addAction(TaskbarIntent.ACTION_START_MENU_APPEARING);
         appearingReceiverFilter.addAction("com.farmerbb.taskbar.CONTEXT_MENU_APPEARING");
         appearingReceiverFilter.addAction("com.farmerbb.taskbar.DASHBOARD_APPEARING");
 
index 1c734a7..b39a912 100644 (file)
@@ -6,4 +6,6 @@ public class TaskbarIntent {
     public static final String ACTION_TOGGLE_START_MENU = "com.farmerbb.taskbar.TOGGLE_START_MENU";
     public static final String ACTION_START_MENU_DISAPPEARING =
             "com.farmerbb.taskbar.START_MENU_DISAPPEARING";
+    public static final String ACTION_START_MENU_APPEARING =
+            "com.farmerbb.taskbar.START_MENU_APPEARING";
 }
index 342d010..2d85997 100644 (file)
@@ -621,7 +621,9 @@ public class StartMenuController implements UIController {
 
             MenuHelper.getInstance().setStartMenuOpen(true);
 
-            LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent("com.farmerbb.taskbar.START_MENU_APPEARING"));
+            LocalBroadcastManager
+                    .getInstance(context)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_START_MENU_APPEARING));
 
             boolean onHomeScreen = LauncherHelper.getInstance().isOnHomeScreen();
             boolean inFreeformMode = FreeformHackHelper.getInstance().isInFreeformWorkspace();
index f0e0a2d..54d6259 100644 (file)
@@ -643,7 +643,10 @@ public class TaskbarController implements UIController {
         lbm.registerReceiver(hideReceiver, new IntentFilter(TaskbarIntent.ACTION_HIDE_TASKBAR));
         lbm.registerReceiver(tempShowReceiver, new IntentFilter("com.farmerbb.taskbar.TEMP_SHOW_TASKBAR"));
         lbm.registerReceiver(tempHideReceiver, new IntentFilter("com.farmerbb.taskbar.TEMP_HIDE_TASKBAR"));
-        lbm.registerReceiver(startMenuAppearReceiver, new IntentFilter("com.farmerbb.taskbar.START_MENU_APPEARING"));
+        lbm.registerReceiver(
+                startMenuAppearReceiver,
+                new IntentFilter(TaskbarIntent.ACTION_START_MENU_APPEARING)
+        );
         lbm.registerReceiver(
                 startMenuDisappearReceiver,
                 new IntentFilter(TaskbarIntent.ACTION_START_MENU_DISAPPEARING)