Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 88126aa1: am b5140130: Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev

Browse Source 
* commit '88126aa1707e38af0b70cb8b9752917f9589cb88':
  Revert "Add massive logging to investigate blank Keyguard"
This commit is contained in:
Jorim Jaggi
2014-09-29 21:03:02 +00:00
committed by Android Git Automerger
parent dbc35f463b 88126aa170
commit 4fda564456
5 changed files with 0 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -92,7 +92,6 @@ import com.android.systemui.SwipeHelper;
import com.android.systemui.SystemUI; import com.android.systemui.SystemUI;
import com.android.systemui.statusbar.NotificationData.Entry; import com.android.systemui.statusbar.NotificationData.Entry;
import com.android.systemui.statusbar.phone.KeyguardTouchDelegate; import com.android.systemui.statusbar.phone.KeyguardTouchDelegate;
import com.android.systemui.statusbar.phone.PhoneStatusBar;
import com.android.systemui.statusbar.phone.NavigationBarView; import com.android.systemui.statusbar.phone.NavigationBarView;
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
import com.android.systemui.statusbar.policy.HeadsUpNotificationView; import com.android.systemui.statusbar.policy.HeadsUpNotificationView;
@@ -293,10 +292,6 @@ public abstract class BaseStatusBar extends SystemUI implements
// close the shade if it was open // close the shade if it was open
if (handled) { if (handled) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from mOnClickHandler after keyguard"
+ "dismiss");
}
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
visibilityChanged(false); visibilityChanged(false);
} }
@@ -343,9 +338,6 @@ public abstract class BaseStatusBar extends SystemUI implements
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0); Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);
if (BANNER_ACTION_SETUP.equals(action)) { if (BANNER_ACTION_SETUP.equals(action)) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Animating collapse because of BANNER_ACTION_SETUP");
}
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION) mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -771,10 +763,6 @@ public abstract class BaseStatusBar extends SystemUI implements
} }
} }
}); });
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from startNotificationGutsIntent after keyguard"
+ "dismiss");
}
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
return true; return true;
} }

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -132,9 +132,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
public boolean performAccessibilityAction(View host, int action, Bundle args) { public boolean performAccessibilityAction(View host, int action, Bundle args) {
if (action == ACTION_CLICK) { if (action == ACTION_CLICK) {
if (host == mLockIcon) { if (host == mLockIcon) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from lock icon accessibility click");
}
mPhoneStatusBar.animateCollapsePanels( mPhoneStatusBar.animateCollapsePanels(
CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
return true; return true;

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
View File

@@ -140,9 +140,6 @@ public class PanelBar extends FrameLayout {
mPanelHolder.setSelectedPanel(mTouchingPanel); mPanelHolder.setSelectedPanel(mTouchingPanel);
for (PanelView pv : mPanels) { for (PanelView pv : mPanels) {
if (pv != panel) { if (pv != panel) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing because opening another panel");
}
pv.collapse(false /* delayed */); pv.collapse(false /* delayed */);
} }
} }
@@ -194,15 +191,9 @@ public class PanelBar extends FrameLayout {
boolean waiting = false; boolean waiting = false;
for (PanelView pv : mPanels) { for (PanelView pv : mPanels) {
if (animate && !pv.isFullyCollapsed()) { if (animate && !pv.isFullyCollapsed()) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Animating collapse, delayed");
}
pv.collapse(true /* delayed */); pv.collapse(true /* delayed */);
waiting = true; waiting = true;
} else { } else {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing without animation");
}
pv.resetViews(); pv.resetViews();
pv.setExpandedFraction(0); // just in case pv.setExpandedFraction(0); // just in case
pv.setVisibility(View.GONE); pv.setVisibility(View.GONE);

40
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -136,9 +136,6 @@ public abstract class PanelView extends FrameLayout {
} }
private void runPeekAnimation() { private void runPeekAnimation() {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Starting peek animation");
}
mPeekHeight = getPeekHeight(); mPeekHeight = getPeekHeight();
if (DEBUG) logf("peek to height=%.1f", mPeekHeight); if (DEBUG) logf("peek to height=%.1f", mPeekHeight);
if (mHeightAnimator != null) { if (mHeightAnimator != null) {
@@ -159,15 +156,9 @@ public abstract class PanelView extends FrameLayout {
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
mPeekAnimator = null; mPeekAnimator = null;
if (mCollapseAfterPeek && !mCancelled) { if (mCollapseAfterPeek && !mCancelled) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Peek animation finished, posting collapse");
}
postOnAnimation(new Runnable() { postOnAnimation(new Runnable() {
@Override @Override
public void run() { public void run() {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Peek animation finished, collapsing");
}
collapse(false /* delayed */); collapse(false /* delayed */);
} }
}); });
@@ -345,9 +336,6 @@ public abstract class PanelView extends FrameLayout {
} }
boolean expand = flingExpands(vel, vectorVel); boolean expand = flingExpands(vel, vectorVel);
onTrackingStopped(expand); onTrackingStopped(expand);
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Flinging: expand=" + expand);
}
DozeLog.traceFling(expand, mTouchAboveFalsingThreshold, DozeLog.traceFling(expand, mTouchAboveFalsingThreshold,
mStatusBar.isFalsingThresholdNeeded()); mStatusBar.isFalsingThresholdNeeded());
fling(vel, expand); fling(vel, expand);
@@ -535,9 +523,6 @@ public abstract class PanelView extends FrameLayout {
notifyExpandingFinished(); notifyExpandingFinished();
return; return;
} }
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Executing fling: expand=" + expand + " vel=" + vel);
}
mOverExpandedBeforeFling = getOverExpansionAmount() > 0f; mOverExpandedBeforeFling = getOverExpansionAmount() > 0f;
ValueAnimator animator = createHeightAnimator(target); ValueAnimator animator = createHeightAnimator(target);
if (expand) { if (expand) {
@@ -719,14 +704,8 @@ public abstract class PanelView extends FrameLayout {
mClosing = true; mClosing = true;
notifyExpandingStarted(); notifyExpandingStarted();
if (delayed) { if (delayed) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Posting collapse runnable, will be run in 120ms");
}
postDelayed(mFlingCollapseRunnable, 120); postDelayed(mFlingCollapseRunnable, 120);
} else { } else {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Animating collapsing now");
}
fling(0, false /* expand */); fling(0, false /* expand */);
} }
} }
@@ -735,9 +714,6 @@ public abstract class PanelView extends FrameLayout {
private final Runnable mFlingCollapseRunnable = new Runnable() { private final Runnable mFlingCollapseRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Executing collapse runnable, animating collapsing now");
}
fling(0, false /* expand */); fling(0, false /* expand */);
} }
}; };
@@ -766,11 +742,6 @@ public abstract class PanelView extends FrameLayout {
} }
public void instantExpand() { public void instantExpand() {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Before instant expanding"
+ " mTracking=" + mTracking
+ " mExpanding=" + mExpanding);
}
mInstantExpanding = true; mInstantExpanding = true;
mUpdateFlingOnLayout = false; mUpdateFlingOnLayout = false;
abortAnimations(); abortAnimations();
@@ -791,11 +762,6 @@ public abstract class PanelView extends FrameLayout {
public void onGlobalLayout() { public void onGlobalLayout() {
if (mStatusBar.getStatusBarWindow().getHeight() if (mStatusBar.getStatusBarWindow().getHeight()
!= mStatusBar.getStatusBarHeight()) { != mStatusBar.getStatusBarHeight()) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Now instant expanding after layout"
+ " mTracking=" + mTracking
+ " mExpanding=" + mExpanding);
}
getViewTreeObserver().removeOnGlobalLayoutListener(this); getViewTreeObserver().removeOnGlobalLayoutListener(this);
setExpandedFraction(1f); setExpandedFraction(1f);
mInstantExpanding = false; mInstantExpanding = false;
@@ -942,9 +908,6 @@ public abstract class PanelView extends FrameLayout {
private final Runnable mPostCollapseRunnable = new Runnable() { private final Runnable mPostCollapseRunnable = new Runnable() {
@Override @Override
public void run() { public void run() {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing after middle clicked");
}
collapse(false /* delayed */); collapse(false /* delayed */);
} }
}; };
@@ -957,9 +920,6 @@ public abstract class PanelView extends FrameLayout {
mStatusBar.goToKeyguard(); mStatusBar.goToKeyguard();
return true; return true;
case StatusBarState.SHADE: case StatusBarState.SHADE:
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Middle clicked in shade state, posting collapsing runnable");
}
// This gets called in the middle of the touch handling, where the state is still // This gets called in the middle of the touch handling, where the state is still
// that we are tracking the panel. Collapse the panel after this is done. // that we are tracking the panel. Collapse the panel after this is done.

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -183,7 +183,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public static final boolean DEBUG_GESTURES = false; public static final boolean DEBUG_GESTURES = false;
public static final boolean DEBUG_MEDIA = false; public static final boolean DEBUG_MEDIA = false;
public static final boolean DEBUG_MEDIA_FAKE_ARTWORK = false; public static final boolean DEBUG_MEDIA_FAKE_ARTWORK = false;
public static final boolean DEBUG_EMPTY_KEYGUARD = true;
public static final boolean DEBUG_WINDOW_STATE = false; public static final boolean DEBUG_WINDOW_STATE = false;
@@ -2282,11 +2281,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mStatusBarWindowManager.setStatusBarFocusable(false); mStatusBarWindowManager.setStatusBarFocusable(false);
mStatusBarWindow.cancelExpandHelper(); mStatusBarWindow.cancelExpandHelper();
if (DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from animateCollapsePanels:"
+ " force=" + force
+ " mState=" + mState);
}
mStatusBarView.collapseAllPanels(true); mStatusBarView.collapseAllPanels(true);
} }
} }
@@ -2374,9 +2368,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
public void animateCollapseQuickSettings() { public void animateCollapseQuickSettings() {
if (DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from animateCollapseQuickSettings");
}
mStatusBarView.collapseAllPanels(true); mStatusBarView.collapseAllPanels(true);
} }
@@ -2389,9 +2380,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
// Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868) // Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868)
if (DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from makeExpandedInvisible");
}
mStatusBarView.collapseAllPanels(/*animate=*/ false); mStatusBarView.collapseAllPanels(/*animate=*/ false);
// reset things to their proper state // reset things to their proper state
@@ -2483,9 +2471,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
mStatusBarWindowState = state; mStatusBarWindowState = state;
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state)); if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));
if (!showing) { if (!showing) {
if (DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from setWindowState");
}
mStatusBarView.collapseAllPanels(false); mStatusBarView.collapseAllPanels(false);
} }
} }
@@ -3045,10 +3030,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
}); });
if (dismissShade) { if (dismissShade) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel startActivityDismissKeyguard after keyguard"
+ "dismiss");
}
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
} }
return true; return true;
@@ -3727,9 +3708,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public boolean onSpacePressed() { public boolean onSpacePressed() {
if (mScreenOn != null && mScreenOn if (mScreenOn != null && mScreenOn
&& (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) { && (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
Log.i(TAG, "Collapsing panel from onSpacePressed");
}
animateCollapsePanels(0 /* flags */, true /* force */); animateCollapsePanels(0 /* flags */, true /* force */);
return true; return true;
} }