diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2019-04-25 22:33:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-25 22:33:31 +0000 |
commit | efe84750930e369763d73a76c647695d7e600bee (patch) | |
tree | 2d92a22adf1120aeec0596e3f1c7fddfd70cee6e /src | |
parent | 03f27013bfcd30f697220b8e6315e76688dc0d3c (diff) | |
parent | a310a80c7b01057eaa89edca99085c24706c9e73 (diff) | |
download | android_packages_apps_Trebuchet-efe84750930e369763d73a76c647695d7e600bee.tar.gz android_packages_apps_Trebuchet-efe84750930e369763d73a76c647695d7e600bee.tar.bz2 android_packages_apps_Trebuchet-efe84750930e369763d73a76c647695d7e600bee.zip |
Merge "Add important dump logging Bug: 130851537 Bug: 119992316" into ub-launcher3-qt-dev
Diffstat (limited to 'src')
7 files changed, 36 insertions, 3 deletions
diff --git a/src/com/android/launcher3/AbstractFloatingView.java b/src/com/android/launcher3/AbstractFloatingView.java index d6f992f51..bd584996c 100644 --- a/src/com/android/launcher3/AbstractFloatingView.java +++ b/src/com/android/launcher3/AbstractFloatingView.java @@ -41,6 +41,7 @@ import com.android.launcher3.util.TouchController; import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.BaseDragLayer; +import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -251,4 +252,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch @FloatingViewType int type) { return getOpenView(activity, type); } + + @Override + public void dump(String prefix, PrintWriter writer) { } } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 1223787bd..fda674f22 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -2346,7 +2346,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, writer.println(" mPendingActivityResult=" + mPendingActivityResult); writer.println(" mRotationHelper: " + mRotationHelper); // Extra logging for b/116853349 - mDragLayer.dumpAlpha(writer); + mDragLayer.dump(prefix, writer); + mStateManager.dump(prefix, writer); dumpMisc(writer); try { diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java index 209578d22..b24f660e6 100644 --- a/src/com/android/launcher3/LauncherStateManager.java +++ b/src/com/android/launcher3/LauncherStateManager.java @@ -50,6 +50,7 @@ import com.android.launcher3.anim.PropertySetter; import com.android.launcher3.anim.PropertySetter.AnimatedPropertySetter; import com.android.launcher3.uioverrides.UiFactory; +import java.io.PrintWriter; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; @@ -144,6 +145,15 @@ public class LauncherStateManager { return mCurrentStableState; } + public void dump(String prefix, PrintWriter writer) { + writer.println(prefix + "LauncherState"); + writer.println(prefix + "\tmLastStableState:" + mLastStableState); + writer.println(prefix + "\tmCurrentStableState:" + mCurrentStableState); + writer.println(prefix + "\tmState:" + mState); + writer.println(prefix + "\tmRestState:" + mRestState); + writer.println(prefix + "\tisInTransition:" + (mConfig.mCurrentAnimation != null)); + } + public StateHandler[] getStateHandlers() { if (mStateHandlers == null) { mStateHandlers = UiFactory.getStateHandler(mLauncher); diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 4d45ba9e6..5c3d4fbbf 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -46,6 +46,7 @@ import com.android.launcher3.util.Thunk; import com.android.launcher3.util.TouchController; import com.android.launcher3.util.UiThreadHelper; +import java.io.PrintWriter; import java.util.ArrayList; /** @@ -697,4 +698,7 @@ public class DragController implements DragDriver.EventListener, TouchController mDropTargets.remove(target); } + @Override + public void dump(String prefix, PrintWriter writer) { } + } diff --git a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java index a1871ff37..34654a93b 100644 --- a/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java +++ b/src/com/android/launcher3/touch/AbstractStateChangeTouchController.java @@ -50,6 +50,8 @@ import com.android.launcher3.util.FlingBlockCheck; import com.android.launcher3.util.PendingAnimation; import com.android.launcher3.util.TouchController; +import java.io.PrintWriter; + /** * TouchController for handling state changes */ @@ -581,4 +583,7 @@ public abstract class AbstractStateChangeTouchController this.endTime = duration + SystemClock.elapsedRealtime(); } } + + @Override + public void dump(String prefix, PrintWriter writer) { } } diff --git a/src/com/android/launcher3/util/TouchController.java b/src/com/android/launcher3/util/TouchController.java index 3cca21500..ac6a5bdcf 100644 --- a/src/com/android/launcher3/util/TouchController.java +++ b/src/com/android/launcher3/util/TouchController.java @@ -18,6 +18,8 @@ package com.android.launcher3.util; import android.view.MotionEvent; +import java.io.PrintWriter; + public interface TouchController { /** @@ -29,4 +31,6 @@ public interface TouchController { * Called when the draglayer receives a intercept touch event. */ boolean onControllerInterceptTouchEvent(MotionEvent ev); + + void dump(String prefix, PrintWriter writer); } diff --git a/src/com/android/launcher3/views/BaseDragLayer.java b/src/com/android/launcher3/views/BaseDragLayer.java index ab72bbe18..66cd536a5 100644 --- a/src/com/android/launcher3/views/BaseDragLayer.java +++ b/src/com/android/launcher3/views/BaseDragLayer.java @@ -383,8 +383,13 @@ public abstract class BaseDragLayer<T extends Context & ActivityContext> return mMultiValueAlpha.getProperty(index); } - public void dumpAlpha(PrintWriter writer) { - writer.println(" dragLayerAlpha : " + mMultiValueAlpha ); + public void dump(String prefix, PrintWriter writer) { + writer.println(prefix + "DragLayer"); + if (mActiveController != null) { + writer.println(prefix + "\tactiveController: " + mActiveController); + mActiveController.dump(prefix + "\t", writer); + } + writer.println(prefix + "\tdragLayerAlpha : " + mMultiValueAlpha ); } public static class LayoutParams extends InsettableFrameLayout.LayoutParams { |