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

Commit 3c7d9cbb authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Clean up around 1) Log.VERBOSE and 2) dump 

b/31772480

Note: in the follow up CL, I will add the dump result of the bgDataModel
to a proto

Change-Id: I5261cff0fb29cedd1dd772b8b15f67095ad5b967
parent 1fafd719

src/com/android/launcher3/AppInfo.java

+0 −11
Original line number Diff line number Diff line
@@ -91,17 +91,6 @@ public class AppInfo extends ItemInfoWithIcon { 
        return super.dumpProperties() + " componentName=" + componentName;

    }



    /**

     * Helper method used for debugging.

     */

    public static void dumpApplicationInfoList(String tag, String label, ArrayList<AppInfo> list) {

        Log.d(tag, label + " size=" + list.size());

        for (AppInfo info: list) {

            Log.d(tag, "   title=\"" + info.title + "\" iconBitmap=" + info.iconBitmap

                    + " componentName=" + info.componentName.getPackageName());

        }

    }



    public ShortcutInfo makeShortcut() {

        return new ShortcutInfo(this);

    }

src/com/android/launcher3/Launcher.java

+29 −52
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ControlType; 
import com.android.launcher3.util.ActivityResultInfo;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.launcher3.util.LogConfig;

import com.android.launcher3.util.MultiHashMap;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.util.PackageUserKey;
@@ -172,10 +173,6 @@ public class Launcher extends BaseActivity 
     */

    protected static final int REQUEST_LAST = 100;



    // To turn on these properties, type

    // adb shell setprop logTap.tag.PROPERTY_NAME [VERBOSE | SUPPRESS]

    static final String DUMP_STATE_PROPERTY = "launcher_dump_state";



    // The Intent extra that defines whether to ignore the launch animation

    static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION =

            "com.android.launcher3.intent.extra.shortcut.INGORE_LAUNCH_ANIMATION";
@@ -2201,25 +2198,7 @@ public class Launcher extends BaseActivity 


    @Override

    public boolean dispatchKeyEvent(KeyEvent event) {

        if (event.getAction() == KeyEvent.ACTION_DOWN) {

            switch (event.getKeyCode()) {

                case KeyEvent.KEYCODE_HOME:

                    return true;

                case KeyEvent.KEYCODE_VOLUME_DOWN:

                    if (Utilities.isPropertyEnabled(DUMP_STATE_PROPERTY)) {

                        dumpState();

                        return true;

                    }

                    break;

            }

        } else if (event.getAction() == KeyEvent.ACTION_UP) {

            switch (event.getKeyCode()) {

                case KeyEvent.KEYCODE_HOME:

                    return true;

            }

        }



        return super.dispatchKeyEvent(event);

        return (event.getKeyCode() == KeyEvent.KEYCODE_HOME) || super.dispatchKeyEvent(event);

    }



    @Override
@@ -3968,23 +3947,13 @@ public class Launcher extends BaseActivity 
    }



    /**

     * Prints out out state for debugging.

     * $ adb shell dumpsys activity com.android.launcher3.Launcher [--all]

     */

    public void dumpState() {

        Log.d(TAG, "BEGIN launcher3 dump state for launcher " + this);

        Log.d(TAG, "mWorkspaceLoading=" + mWorkspaceLoading);

        Log.d(TAG, "mPendingRequestArgs=" + mPendingRequestArgs);

        Log.d(TAG, "mPendingActivityResult=" + mPendingActivityResult);

        mModel.dumpState();

        // TODO(hyunyoungs): add mWidgetsView.dumpState(); or mWidgetsModel.dumpState();



        Log.d(TAG, "END launcher3 dump state");

    }



    @Override

    public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {

        super.dump(prefix, fd, writer, args);

        // Dump workspace



        if (args.length > 0 && TextUtils.equals(args[0], "--all")) {

            writer.println(prefix + "Workspace Items");

            for (int i = mWorkspace.numCustomPages(); i < mWorkspace.getPageCount(); i++) {

                writer.println(prefix + "  Homescreen " + i);
@@ -4012,6 +3981,14 @@ public class Launcher extends BaseActivity 
            } catch (Exception e) {

                // Ignore

            }

        }



        writer.println(prefix + "Misc:");

        writer.print(prefix + "\tmWorkspaceLoading=" + mWorkspaceLoading);

        writer.print(" mPendingRequestArgs=" + mPendingRequestArgs);

        writer.println(" mPendingActivityResult=" + mPendingActivityResult);



        mModel.dumpState(prefix, fd, writer, args);



        if (mLauncherCallbacks != null) {

            mLauncherCallbacks.dump(prefix, fd, writer, args);

src/com/android/launcher3/LauncherModel.java

+10 −19
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ import com.android.launcher3.util.Provider; 
import com.android.launcher3.util.Thunk;

import com.android.launcher3.util.ViewOnDrawExecutor;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.lang.ref.WeakReference;

import java.net.URISyntaxException;

import java.util.ArrayList;
@@ -2098,15 +2100,6 @@ public class LauncherModel extends BroadcastReceiver 
            }

            bindDeepShortcuts();

        }



        public void dumpState() {

            synchronized (sBgDataModel) {

                Log.d(TAG, "mLoaderTask.mContext=" + mContext);

                Log.d(TAG, "mLoaderTask.mStopped=" + mStopped);

                Log.d(TAG, "mLoaderTask.mLoadAndBindStepFinished=" + mLoadAndBindStepFinished);

                Log.d(TAG, "mItems size=" + sBgDataModel.workspaceItems.size());

            }

        }

    }



    public void bindDeepShortcuts() {
@@ -2267,17 +2260,15 @@ public class LauncherModel extends BroadcastReceiver 
                && (provider.provider.getPackageName() != null);

    }



    public void dumpState() {

        Log.d(TAG, "mCallbacks=" + mCallbacks);

        AppInfo.dumpApplicationInfoList(TAG, "mAllAppsList.data", mBgAllAppsList.data);

        AppInfo.dumpApplicationInfoList(TAG, "mAllAppsList.added", mBgAllAppsList.added);

        AppInfo.dumpApplicationInfoList(TAG, "mAllAppsList.removed", mBgAllAppsList.removed);

        AppInfo.dumpApplicationInfoList(TAG, "mAllAppsList.modified", mBgAllAppsList.modified);

        if (mLoaderTask != null) {

            mLoaderTask.dumpState();

        } else {

            Log.d(TAG, "mLoaderTask=null");

    public void dumpState(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {

        if (args.length > 0 && TextUtils.equals(args[0], "--all")) {

            writer.println(prefix + "All apps list: size=" + mBgAllAppsList.data.size());

            for (AppInfo info : mBgAllAppsList.data) {

                writer.println(prefix + "   title=\"" + info.title + "\" iconBitmap=" + info.iconBitmap

                        + " componentName=" + info.componentName.getPackageName());

            }

        }

        sBgDataModel.dump(prefix, fd, writer, args);

    }



    public Callbacks getCallback() {

src/com/android/launcher3/logging/UserEventDispatcher.java

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; 
import com.android.launcher3.userevent.nano.LauncherLogProto.LauncherEvent;

import com.android.launcher3.userevent.nano.LauncherLogProto.Target;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.LogConfig;



import java.util.List;

import java.util.Locale;
@@ -56,7 +57,7 @@ public class UserEventDispatcher { 


    private static final String TAG = "UserEvent";

    private static final boolean IS_VERBOSE =

            ProviderConfig.IS_DOGFOOD_BUILD && Utilities.isPropertyEnabled(TAG);

            ProviderConfig.IS_DOGFOOD_BUILD && Utilities.isPropertyEnabled(LogConfig.USEREVENT);



    /**

     * Implemented by containers to provide a container source for a given child.

src/com/android/launcher3/model/BgDataModel.java

+34 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.model; 


import android.content.Context;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.util.MutableInt;
@@ -35,6 +36,8 @@ import com.android.launcher3.util.ComponentKey; 
import com.android.launcher3.util.LongArrayMap;

import com.android.launcher3.util.MultiHashMap;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;
@@ -99,6 +102,37 @@ public class BgDataModel { 
        deepShortcutMap.clear();

    }



    // TODO: current dump is very cryptic and hard to understand. Make it more legible.

    public synchronized void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {

        writer.println(prefix + "Data Model:");

        for (int i = 0; i < workspaceScreens.size(); i++) {

            writer.println(prefix + "\tIndex of workspaceScreens:" + workspaceScreens.get(i).toString());

        }

        for (int i = 0; i < workspaceItems.size(); i++) {

            writer.println(prefix + '\t' + workspaceItems.get(i).toString());

        }

        for (int i = 0; i < appWidgets.size(); i++) {

            writer.println(prefix + '\t' + appWidgets.get(i).toString());

        }

        for (int i = 0; i< folders.size(); i++) {

            writer.println(prefix + '\t' + folders.valueAt(i).toString());

        }

        for (int i = 0; i< itemsIdMap.size(); i++) {

            writer.println(prefix + '\t' + itemsIdMap.valueAt(i).toString());

        }



        if (args.length > 0 && TextUtils.equals(args[0], "--all")) {

            writer.println(prefix + "shortcuts");

            for (ArrayList<String> map : deepShortcutMap.values()) {

                writer.print(prefix + "  ");

                for (String str : map) {

                    writer.print(str.toString() + ", ");

                }

                writer.println();

            }

        }

    }



    public synchronized void removeItem(Context context, ItemInfo... items) {

        removeItem(context, Arrays.asList(items));

    }