Commit f5adce87 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Removed logging for the empty keyguard" into mnc-dev

parents 51b4e97a 7025f26a
......@@ -658,11 +658,6 @@ public abstract class PanelView extends FrameLayout {
(animator.getDuration() * getCannedFlingDurationFactor()
/ collapseSpeedUpFactor));
}
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD
&& mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "
+ Log.getStackTraceString(new Throwable()));
}
}
animator.addListener(new AnimatorListenerAdapter() {
private boolean mCancelled;
......@@ -777,15 +772,6 @@ public abstract class PanelView extends FrameLayout {
public void setExpandedFraction(float frac) {
setExpandedHeight(getMaxPanelHeight() * frac);
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD
&& mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
if (frac == 0.0f) {
Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "
+ Log.getStackTraceString(new Throwable()));
} else if (frac == 1.0f) {
mStatusBar.endWindowManagerLogging();
}
}
}
public float getExpandedHeight() {
......@@ -817,11 +803,6 @@ public abstract class PanelView extends FrameLayout {
}
public void collapse(boolean delayed, float speedUpFactor) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD
&& mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "
+ Log.getStackTraceString(new Throwable()));
}
if (DEBUG) logf("collapse: " + this);
if (mPeekPending || mPeekAnimator != null) {
mCollapseAfterPeek = true;
......
......@@ -185,7 +185,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
HeadsUpManager.OnHeadsUpChangedListener {
static final String TAG = "PhoneStatusBar";
public static final boolean DEBUG = BaseStatusBar.DEBUG;
public static final boolean DEBUG_EMPTY_KEYGUARD = true;
public static final boolean SPEW = false;
public static final boolean DUMPTRUCK = true; // extra dumpsys info
public static final boolean DEBUG_GESTURES = false;
......@@ -2009,10 +2008,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mStatusBarWindowManager.setPanelExpanded(isExpanded);
}
public void endWindowManagerLogging() {
mStatusBarWindowManager.setLogState(false);
}
/**
* All changes to the status bar and notifications funnel through here and are batched.
*/
......@@ -2675,7 +2670,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
pw.print(" status bar gestures: ");
mGestureRec.dump(fd, pw, args);
}
if (mStatusBarWindowManager != null) {
mStatusBarWindowManager.dump(fd, pw, args);
}
if (mNetworkController != null) {
mNetworkController.dump(fd, pw, args);
}
......@@ -3592,9 +3589,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
// Make our window larger and the panel expanded.
makeExpandedVisible(true);
mNotificationPanel.instantExpand();
if (DEBUG_EMPTY_KEYGUARD) {
mStatusBarWindowManager.setLogState(true);
}
}
private void instantCollapseNotificationPanel() {
......
......@@ -20,14 +20,12 @@ import android.content.Context;
import android.content.res.Resources;
import android.util.AttributeSet;
import android.util.EventLog;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import com.android.systemui.EventLogTags;
import com.android.systemui.R;
import com.android.systemui.statusbar.StatusBarState;
public class PhoneStatusBarView extends PanelBar {
private static final String TAG = "PhoneStatusBarView";
......@@ -118,11 +116,6 @@ public class PhoneStatusBarView extends PanelBar {
@Override
public void onAllPanelsCollapsed() {
super.onAllPanelsCollapsed();
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD
&& mBar.getBarState() == StatusBarState.KEYGUARD) {
Log.i(PhoneStatusBar.TAG, "Panel collapsed! Stacktrace: "
+ Log.getStackTraceString(new Throwable()));
}
// Close the status bar in the next frame so we can show the end of the animation.
postOnAnimation(mHideExpandedRunnable);
mLastFullyOpenedPanel = null;
......
......@@ -21,7 +21,6 @@ import android.content.pm.ActivityInfo;
import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.os.SystemProperties;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
......@@ -32,6 +31,8 @@ import com.android.systemui.keyguard.KeyguardViewMediator;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.StatusBarState;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.reflect.Field;
/**
......@@ -48,7 +49,6 @@ public class StatusBarWindowManager {
private final boolean mKeyguardScreenRotation;
private final State mCurrentState = new State();
private boolean mLogState;
public StatusBarWindowManager(Context context) {
mContext = context;
......@@ -183,9 +183,6 @@ public class StatusBarWindowManager {
applyFitsSystemWindows(state);
applyModalFlag(state);
if (mLp.copyFrom(mLpChanged) != 0) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD && mLogState) {
logCurrentState();
}
mWindowManager.updateViewLayout(mStatusBarView, mLp);
}
}
......@@ -282,19 +279,9 @@ public class StatusBarWindowManager {
apply(mCurrentState);
}
public void setLogState(boolean logState) {
mLogState = logState;
if (logState) {
Log.w(PhoneStatusBar.TAG, "===== Started logging WM state changes =====");
logCurrentState();
} else {
Log.w(PhoneStatusBar.TAG, "===== Finished logging WM state changes =====");
}
}
private void logCurrentState() {
Log.i(PhoneStatusBar.TAG, mCurrentState.toString()
+ "\n Expanded: " + isExpanded(mCurrentState));
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
pw.println("StatusBarWindowManager state:");
pw.println(mCurrentState);
}
private static class State {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment