Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6dde396 authored by Tony Wickham's avatar Tony Wickham
Browse files

Add some more data to TouchInteractionService dumps 

- Dump OverviewComponentObserver (to check if we're using 3P launcher)
- Dump current enabled and disabled plugins
- Dump all debug FeatureFlags instead of a few handpicked ones

Bug: 146174627
Change-Id: Ic8df899433b0e42d0e05eb1c80c87f62d3b936b6
parent f7205c76

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+3 −8
Original line number Diff line number Diff line
@@ -713,20 +713,15 @@ public class TouchInteractionService extends Service implements PluginListener<O 
            }

        } else {

            // Dump everything

            FeatureFlags.dump(pw);

            PluginManagerWrapper.INSTANCE.get(getBaseContext()).dump(pw);

            mDeviceState.dump(pw);

            mOverviewComponentObserver.dump(pw);

            pw.println("TouchState:");

            boolean resumed = mOverviewComponentObserver != null

                    && mOverviewComponentObserver.getActivityInterface().isResumed();

            pw.println("  resumed=" + resumed);

            pw.println("  mConsumer=" + mConsumer.getName());

            pw.println("FeatureFlags:");

            pw.println("  APPLY_CONFIG_AT_RUNTIME=" + APPLY_CONFIG_AT_RUNTIME.get());

            pw.println("  QUICKSTEP_SPRINGS=" + QUICKSTEP_SPRINGS.get());

            pw.println("  UNSTABLE_SPRINGS=" + UNSTABLE_SPRINGS.get());

            pw.println("  ADAPTIVE_ICON_WINDOW_ANIM=" + ADAPTIVE_ICON_WINDOW_ANIM.get());

            pw.println("  ENABLE_QUICKSTEP_LIVE_TILE=" + ENABLE_QUICKSTEP_LIVE_TILE.get());

            pw.println("  ENABLE_HINTS_IN_OVERVIEW=" + ENABLE_HINTS_IN_OVERVIEW.get());

            pw.println("  FAKE_LANDSCAPE_UI=" + FAKE_LANDSCAPE_UI.get());

            ActiveGestureLog.INSTANCE.dump("", pw);

        }

    }

quickstep/src/com/android/launcher3/uioverrides/plugins/PluginManagerWrapper.java

+30 −0
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ 


package com.android.launcher3.uioverrides.plugins;



import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ResolveInfo;



import com.android.launcher3.util.MainThreadInitializedObject;

import com.android.systemui.plugins.Plugin;
@@ -24,6 +28,9 @@ import com.android.systemui.shared.plugins.PluginManager; 
import com.android.systemui.shared.plugins.PluginManagerImpl;

import com.android.systemui.shared.plugins.PluginPrefs;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Set;



public class PluginManagerWrapper {
@@ -75,4 +82,27 @@ public class PluginManagerWrapper { 
    public static boolean hasPlugins(Context context) {

        return PluginPrefs.hasPlugins(context);

    }



    public void dump(PrintWriter pw) {

        final List<ComponentName> enabledPlugins = new ArrayList<>();

        final List<ComponentName> disabledPlugins = new ArrayList<>();

        for (String action : getPluginActions()) {

            for (ResolveInfo resolveInfo : mContext.getPackageManager().queryIntentServices(

                    new Intent(action), MATCH_DISABLED_COMPONENTS)) {

                ComponentName installedPlugin = new ComponentName(

                        resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);

                if (mPluginEnabler.isEnabled(installedPlugin)) {

                    enabledPlugins.add(installedPlugin);

                } else {

                    disabledPlugins.add(installedPlugin);

                }

            }

        }



        pw.println("PluginManager:");

        pw.println("  numEnabledPlugins=" + enabledPlugins.size());

        pw.println("  numDisabledPlugins=" + disabledPlugins.size());

        pw.println("  enabledPlugins=" + enabledPlugins);

        pw.println("  disabledPlugins=" + disabledPlugins);

    }

}

quickstep/src/com/android/quickstep/OverviewComponentObserver.java

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.util.SparseIntArray; 


import com.android.systemui.shared.system.PackageManagerWrapper;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Objects;
@@ -233,4 +234,13 @@ public final class OverviewComponentObserver { 
    public BaseActivityInterface getActivityInterface() {

        return mActivityInterface;

    }



    public void dump(PrintWriter pw) {

        pw.println("OverviewComponentObserver:");

        pw.println("  isDefaultHome=" + mIsDefaultHome);

        pw.println("  isHomeDisabled=" + mIsHomeDisabled);

        pw.println("  homeAndOverviewSame=" + mIsHomeAndOverviewSame);

        pw.println("  overviewIntent=" + mOverviewIntent);

        pw.println("  homeIntent=" + mCurrentHomeIntent);

    }

}

src/com/android/launcher3/config/FeatureFlags.java

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.launcher3.BuildConfig; 
import com.android.launcher3.Utilities;

import com.android.launcher3.uioverrides.DeviceFlag;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;
@@ -145,6 +146,15 @@ public final class FeatureFlags { 
        }

    }



    public static void dump(PrintWriter pw) {

        pw.println("FeatureFlags:");

        synchronized (sDebugFlags) {

            for (DebugFlag flag : sDebugFlags) {

                pw.println("  " + flag.key + "=" + flag.get());

            }

        }

    }



    public static class BooleanFlag {



        public final String key;