From: utzcoz <utzcoz@outlook.com>
Date: Mon, 23 Mar 2020 01:22:59 +0000 (+0800)
Subject: Extract *WIDGET* to TaskbarIntent constant
X-Git-Tag: android-x86-9.0-r2~3^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=13d3ac582f170fad9f6e78c7c1fcd9be2825dadd;p=android-x86%2Fpackages-apps-Taskbar.git

Extract *WIDGET* to TaskbarIntent constant

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

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 348a53ce..2d034a81 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/DashboardActivity.java
@@ -91,12 +91,16 @@ public class DashboardActivity extends Activity {
             builder.setTitle(R.string.tb_remove_widget)
                     .setMessage(R.string.tb_are_you_sure)
                     .setNegativeButton(R.string.tb_action_cancel, (dialog, which) -> {
-                        LocalBroadcastManager.getInstance(DashboardActivity.this).sendBroadcast(new Intent("com.farmerbb.taskbar.REMOVE_WIDGET_COMPLETED"));
+                        LocalBroadcastManager
+                                .getInstance(DashboardActivity.this)
+                                .sendBroadcast(
+                                        new Intent(TaskbarIntent.ACTION_REMOVE_WIDGET_COMPLETED)
+                                );
 
                         shouldFinish = true;
                     })
                     .setPositiveButton(R.string.tb_action_ok, (dialog, which) -> {
-                        Intent intent1 = new Intent("com.farmerbb.taskbar.REMOVE_WIDGET_COMPLETED");
+                        Intent intent1 = new Intent(TaskbarIntent.ACTION_REMOVE_WIDGET_COMPLETED);
                         intent1.putExtra("cellId", cellId);
                         LocalBroadcastManager.getInstance(DashboardActivity.this).sendBroadcast(intent1);
 
@@ -140,8 +144,18 @@ public class DashboardActivity extends Activity {
         LinearLayout layout = findViewById(R.id.incognitoLayout);
         layout.setLayoutParams(new FrameLayout.LayoutParams(display.width, display.height));
 
-        LocalBroadcastManager.getInstance(this).registerReceiver(addWidgetReceiver, new IntentFilter("com.farmerbb.taskbar.ADD_WIDGET_REQUESTED"));
-        LocalBroadcastManager.getInstance(this).registerReceiver(removeWidgetReceiver, new IntentFilter("com.farmerbb.taskbar.REMOVE_WIDGET_REQUESTED"));
+        LocalBroadcastManager
+                .getInstance(this)
+                .registerReceiver(
+                        addWidgetReceiver,
+                        new IntentFilter(TaskbarIntent.ACTION_ADD_WIDGET_REQUESTED)
+                );
+        LocalBroadcastManager
+                .getInstance(this)
+                .registerReceiver(
+                        removeWidgetReceiver,
+                        new IntentFilter(TaskbarIntent.ACTION_REMOVE_WIDGET_REQUESTED)
+                );
         LocalBroadcastManager.getInstance(this).registerReceiver(finishReceiver, new IntentFilter("com.farmerbb.taskbar.DASHBOARD_DISAPPEARING"));
 
         if(!DashboardHelper.getInstance().isDashboardOpen()) finish();
@@ -218,7 +232,9 @@ public class DashboardActivity extends Activity {
                 }
             }
 
-            LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.ADD_WIDGET_COMPLETED"));
+            LocalBroadcastManager
+                    .getInstance(this)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_ADD_WIDGET_COMPLETED));
             LocalBroadcastManager
                     .getInstance(this)
                     .sendBroadcast(new Intent(TaskbarIntent.ACTION_TEMP_SHOW_TASKBAR));
@@ -250,7 +266,7 @@ public class DashboardActivity extends Activity {
     }
 
     private void createWidget(Intent data) {
-        Intent intent = new Intent("com.farmerbb.taskbar.ADD_WIDGET_COMPLETED");
+        Intent intent = new Intent(TaskbarIntent.ACTION_ADD_WIDGET_COMPLETED);
         intent.putExtra("appWidgetId", data.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, -1));
         intent.putExtra("cellId", cellId);
 
diff --git a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
index f3cf50eb..67a607f4 100644
--- a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
+++ b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
@@ -55,4 +55,12 @@ public class TaskbarIntent {
             "com.farmerbb.taskbar.CONTEXT_MENU_DISAPPEARING";
     public static final String ACTION_HIDE_CONTEXT_MENU =
             "com.farmerbb.taskbar.HIDE_CONTEXT_MENU";
+    public static final String ACTION_ADD_WIDGET_COMPLETED =
+            "com.farmerbb.taskbar.ADD_WIDGET_COMPLETED";
+    public static final String ACTION_REMOVE_WIDGET_COMPLETED =
+            "com.farmerbb.taskbar.REMOVE_WIDGET_COMPLETED";
+    public static final String ACTION_ADD_WIDGET_REQUESTED =
+            "com.farmerbb.taskbar.ADD_WIDGET_REQUESTED";
+    public static final String ACTION_REMOVE_WIDGET_REQUESTED =
+            "com.farmerbb.taskbar.REMOVE_WIDGET_REQUESTED";
 }
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 442eabcd..f307fdaa 100644
--- a/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
@@ -268,8 +268,14 @@ public class DashboardController implements UIController {
         lbm.unregisterReceiver(hideReceiver);
 
         lbm.registerReceiver(toggleReceiver, new IntentFilter("com.farmerbb.taskbar.TOGGLE_DASHBOARD"));
-        lbm.registerReceiver(addWidgetReceiver, new IntentFilter("com.farmerbb.taskbar.ADD_WIDGET_COMPLETED"));
-        lbm.registerReceiver(removeWidgetReceiver, new IntentFilter("com.farmerbb.taskbar.REMOVE_WIDGET_COMPLETED"));
+        lbm.registerReceiver(
+                addWidgetReceiver,
+                new IntentFilter(TaskbarIntent.ACTION_ADD_WIDGET_COMPLETED)
+        );
+        lbm.registerReceiver(
+                removeWidgetReceiver,
+                new IntentFilter(TaskbarIntent.ACTION_REMOVE_WIDGET_COMPLETED)
+        );
         lbm.registerReceiver(hideReceiver, new IntentFilter("com.farmerbb.taskbar.HIDE_DASHBOARD"));
 
         host.addView(layout, params);
@@ -469,7 +475,7 @@ public class DashboardController implements UIController {
             FrameLayout frameLayout = cells.get(currentlySelectedCell);
             frameLayout.findViewById(R.id.empty).setVisibility(View.GONE);
 
-            Intent intent = new Intent("com.farmerbb.taskbar.ADD_WIDGET_REQUESTED");
+            Intent intent = new Intent(TaskbarIntent.ACTION_ADD_WIDGET_REQUESTED);
             intent.putExtra("appWidgetId", APPWIDGET_HOST_ID);
             intent.putExtra("cellId", cellId);
             LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
@@ -506,7 +512,7 @@ public class DashboardController implements UIController {
         Bundle bundle = (Bundle) view.getTag();
         int cellId = bundle.getInt("cellId");
 
-        Intent intent = new Intent("com.farmerbb.taskbar.REMOVE_WIDGET_REQUESTED");
+        Intent intent = new Intent(TaskbarIntent.ACTION_REMOVE_WIDGET_REQUESTED);
         intent.putExtra("cellId", cellId);
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
     }