GestureNavbarManager: fix toggle notifications panel

Signed-off-by: DHD2280 <[email protected]>
DHD2280 · Dec 13, 2024 · b881103 · b881103
1 parent 436ad34
commit b881103
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/framework/Buttons.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/framework/Buttons.java
@@ -84,18 +84,6 @@ public Buttons(Context context) {
         super(context);
     }
 
-    public static void toggleNotifications() {
-        if (PWM != null) {
-            Object statusBarService = callMethod(PWM, "getStatusBarService");
-            try {
-                if (statusBarService != null)
-                    callMethod(PWM, "statusBarService");
-            } catch (Throwable t) {
-                XposedBridge.log("[ Oxygen Customizer - Buttons ] ERROR: " + t);
-            }
-        }
-    }
-
     @Override
     public void updatePrefs(String... Key) {
 

diff --git a/.../main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/navbar/GestureNavbarManager.java b/.../main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/navbar/GestureNavbarManager.java
@@ -12,7 +12,6 @@
 import static de.robv.android.xposed.XposedHelpers.setAdditionalInstanceField;
 import static de.robv.android.xposed.XposedHelpers.setObjectField;
 import static it.dhd.oxygencustomizer.xposed.XPrefs.Xprefs;
-import static it.dhd.oxygencustomizer.xposed.hooks.framework.Buttons.toggleNotifications;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -33,6 +32,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.core.content.res.ResourcesCompat;
@@ -44,6 +44,7 @@
 import java.util.UUID;
 
 import de.robv.android.xposed.XC_MethodHook;
+import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.callbacks.XC_LoadPackage;
 import it.dhd.oxygencustomizer.R;
 import it.dhd.oxygencustomizer.utils.Constants;
@@ -78,6 +79,7 @@ public class GestureNavbarManager extends XposedMods {
     private String QSExpandMethodName = "";
     private Object NotificationPanelViewController;
     private Object mNavigationBarInflaterView = null;
+    private Object mCentralSurfacesImpl = null;
     //region pill color
     private boolean colorReplaced = false;
     //endregion
@@ -141,6 +143,14 @@ public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Th
             SideGestureNavView = findClass("com.oplusos.systemui.navigationbar.gesture.sidegesture.SideGestureNavView", lpparam.classLoader); // OOS 13
         }
 
+        Class<?> CentralSurfacesImpl = findClass("com.android.systemui.statusbar.phone.CentralSurfacesImpl", lpparam.classLoader);
+        hookAllConstructors(CentralSurfacesImpl, new XC_MethodHook() {
+            @Override
+            protected void afterHookedMethod(MethodHookParam param) throws Throwable {
+                mCentralSurfacesImpl = param.thisObject;
+            }
+        });
+
         if (Build.VERSION.SDK_INT >= 34) {
             hookAllConstructors(SideGestureDetector, new XC_MethodHook() {
                 @Override
@@ -313,6 +323,13 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 mNavigationBarInflaterView = param.thisObject;
+//                android.app.contextualsearch.ContextualSearchManager
+//                ContextualSearchManager contextualSearchManager = (ContextualSearchManager) this.context.getSystemService(ContextualSearchManager.class);
+                FrameLayout frame = (FrameLayout) mNavigationBarInflaterView;
+                frame.setOnLongClickListener(v -> {
+                    XposedBridge.log("Long click");
+                    return true;
+                });
                 refreshNavbar();
             }
         });
@@ -522,6 +539,16 @@ private void showPowerMenu() {
 
     }
 
+    private void toggleNotifications() {
+        if (mCentralSurfacesImpl == null) return;
+
+        try {
+            new Handler(Looper.getMainLooper()).post(() -> callMethod(mCentralSurfacesImpl, "togglePanel"));
+        } catch (Throwable t) {
+            log(t);
+        }
+    }
+
     private String getDefaultLauncherPackageName() {
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.addCategory(Intent.CATEGORY_HOME);