Skip to content

Commit b514013

Browse files
XSJoJoAndroid (Google) Code Review
XSJoJo
authored and
Android (Google) Code Review
committed
Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev
2 parents e98a55e + 8a63806 commit b514013

5 files changed

Lines changed: 0 additions & 86 deletions

File tree

‎packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
import com.android.systemui.SystemUI;
9393
import com.android.systemui.statusbar.NotificationData.Entry;
9494
import com.android.systemui.statusbar.phone.KeyguardTouchDelegate;
95-
import com.android.systemui.statusbar.phone.PhoneStatusBar;
9695
import com.android.systemui.statusbar.phone.NavigationBarView;
9796
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
9897
import com.android.systemui.statusbar.policy.HeadsUpNotificationView;
@@ -293,10 +292,6 @@ public boolean onDismiss() {
293292

294293
// close the shade if it was open
295294
if (handled) {
296-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
297-
Log.i(TAG, "Collapsing panel from mOnClickHandler after keyguard"
298-
+ "dismiss");
299-
}
300295
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
301296
visibilityChanged(false);
302297
}
@@ -343,9 +338,6 @@ public void onReceive(Context context, Intent intent) {
343338
Settings.Secure.putInt(mContext.getContentResolver(),
344339
Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);
345340
if (BANNER_ACTION_SETUP.equals(action)) {
346-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
347-
Log.i(TAG, "Animating collapse because of BANNER_ACTION_SETUP");
348-
}
349341
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
350342
mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION)
351343
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -771,10 +763,6 @@ public void run() {
771763
}
772764
}
773765
});
774-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
775-
Log.i(TAG, "Collapsing panel from startNotificationGutsIntent after keyguard"
776-
+ "dismiss");
777-
}
778766
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
779767
return true;
780768
}

‎packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfo i
132132
public boolean performAccessibilityAction(View host, int action, Bundle args) {
133133
if (action == ACTION_CLICK) {
134134
if (host == mLockIcon) {
135-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
136-
Log.i(TAG, "Collapsing panel from lock icon accessibility click");
137-
}
138135
mPhoneStatusBar.animateCollapsePanels(
139136
CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
140137
return true;

‎packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ public void startOpeningPanel(PanelView panel) {
140140
mPanelHolder.setSelectedPanel(mTouchingPanel);
141141
for (PanelView pv : mPanels) {
142142
if (pv != panel) {
143-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
144-
Log.i(TAG, "Collapsing because opening another panel");
145-
}
146143
pv.collapse(false /* delayed */);
147144
}
148145
}
@@ -194,15 +191,9 @@ public void collapseAllPanels(boolean animate) {
194191
boolean waiting = false;
195192
for (PanelView pv : mPanels) {
196193
if (animate && !pv.isFullyCollapsed()) {
197-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
198-
Log.i(TAG, "Animating collapse, delayed");
199-
}
200194
pv.collapse(true /* delayed */);
201195
waiting = true;
202196
} else {
203-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
204-
Log.i(TAG, "Collapsing without animation");
205-
}
206197
pv.resetViews();
207198
pv.setExpandedFraction(0); // just in case
208199
pv.setVisibility(View.GONE);

‎packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ private void schedulePeek() {
136136
}
137137

138138
private void runPeekAnimation() {
139-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
140-
Log.i(TAG, "Starting peek animation");
141-
}
142139
mPeekHeight = getPeekHeight();
143140
if (DEBUG) logf("peek to height=%.1f", mPeekHeight);
144141
if (mHeightAnimator != null) {
@@ -159,15 +156,9 @@ public void onAnimationCancel(Animator animation) {
159156
public void onAnimationEnd(Animator animation) {
160157
mPeekAnimator = null;
161158
if (mCollapseAfterPeek && !mCancelled) {
162-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
163-
Log.i(TAG, "Peek animation finished, posting collapse");
164-
}
165159
postOnAnimation(new Runnable() {
166160
@Override
167161
public void run() {
168-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
169-
Log.i(TAG, "Peek animation finished, collapsing");
170-
}
171162
collapse(false /* delayed */);
172163
}
173164
});
@@ -345,9 +336,6 @@ public boolean onTouchEvent(MotionEvent event) {
345336
}
346337
boolean expand = flingExpands(vel, vectorVel);
347338
onTrackingStopped(expand);
348-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
349-
Log.i(TAG, "Flinging: expand=" + expand);
350-
}
351339
DozeLog.traceFling(expand, mTouchAboveFalsingThreshold,
352340
mStatusBar.isFalsingThresholdNeeded());
353341
fling(vel, expand);
@@ -535,9 +523,6 @@ && mExpandedHeight < getMaxPanelHeight() - getClearAllHeight()
535523
notifyExpandingFinished();
536524
return;
537525
}
538-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
539-
Log.i(TAG, "Executing fling: expand=" + expand + " vel=" + vel);
540-
}
541526
mOverExpandedBeforeFling = getOverExpansionAmount() > 0f;
542527
ValueAnimator animator = createHeightAnimator(target);
543528
if (expand) {
@@ -719,14 +704,8 @@ public void collapse(boolean delayed) {
719704
mClosing = true;
720705
notifyExpandingStarted();
721706
if (delayed) {
722-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
723-
Log.i(TAG, "Posting collapse runnable, will be run in 120ms");
724-
}
725707
postDelayed(mFlingCollapseRunnable, 120);
726708
} else {
727-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
728-
Log.i(TAG, "Animating collapsing now");
729-
}
730709
fling(0, false /* expand */);
731710
}
732711
}
@@ -735,9 +714,6 @@ public void collapse(boolean delayed) {
735714
private final Runnable mFlingCollapseRunnable = new Runnable() {
736715
@Override
737716
public void run() {
738-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
739-
Log.i(TAG, "Executing collapse runnable, animating collapsing now");
740-
}
741717
fling(0, false /* expand */);
742718
}
743719
};
@@ -766,11 +742,6 @@ public void cancelPeek() {
766742
}
767743

768744
public void instantExpand() {
769-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
770-
Log.i(TAG, "Before instant expanding"
771-
+ " mTracking=" + mTracking
772-
+ " mExpanding=" + mExpanding);
773-
}
774745
mInstantExpanding = true;
775746
mUpdateFlingOnLayout = false;
776747
abortAnimations();
@@ -791,11 +762,6 @@ public void instantExpand() {
791762
public void onGlobalLayout() {
792763
if (mStatusBar.getStatusBarWindow().getHeight()
793764
!= mStatusBar.getStatusBarHeight()) {
794-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
795-
Log.i(TAG, "Now instant expanding after layout"
796-
+ " mTracking=" + mTracking
797-
+ " mExpanding=" + mExpanding);
798-
}
799765
getViewTreeObserver().removeOnGlobalLayoutListener(this);
800766
setExpandedFraction(1f);
801767
mInstantExpanding = false;
@@ -942,9 +908,6 @@ private boolean onEmptySpaceClick(float x) {
942908
private final Runnable mPostCollapseRunnable = new Runnable() {
943909
@Override
944910
public void run() {
945-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
946-
Log.i(TAG, "Collapsing after middle clicked");
947-
}
948911
collapse(false /* delayed */);
949912
}
950913
};
@@ -957,9 +920,6 @@ private boolean onMiddleClicked() {
957920
mStatusBar.goToKeyguard();
958921
return true;
959922
case StatusBarState.SHADE:
960-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
961-
Log.i(TAG, "Middle clicked in shade state, posting collapsing runnable");
962-
}
963923

964924
// This gets called in the middle of the touch handling, where the state is still
965925
// that we are tracking the panel. Collapse the panel after this is done.

‎packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
183183
public static final boolean DEBUG_GESTURES = false;
184184
public static final boolean DEBUG_MEDIA = false;
185185
public static final boolean DEBUG_MEDIA_FAKE_ARTWORK = false;
186-
public static final boolean DEBUG_EMPTY_KEYGUARD = true;
187186

188187
public static final boolean DEBUG_WINDOW_STATE = false;
189188

@@ -2282,11 +2281,6 @@ public void animateCollapsePanels(int flags, boolean force) {
22822281
mStatusBarWindowManager.setStatusBarFocusable(false);
22832282

22842283
mStatusBarWindow.cancelExpandHelper();
2285-
if (DEBUG_EMPTY_KEYGUARD) {
2286-
Log.i(TAG, "Collapsing panel from animateCollapsePanels:"
2287-
+ " force=" + force
2288-
+ " mState=" + mState);
2289-
}
22902284
mStatusBarView.collapseAllPanels(true);
22912285
}
22922286
}
@@ -2374,9 +2368,6 @@ public void animateExpandSettingsPanel() {
23742368
}
23752369

23762370
public void animateCollapseQuickSettings() {
2377-
if (DEBUG_EMPTY_KEYGUARD) {
2378-
Log.i(TAG, "Collapsing panel from animateCollapseQuickSettings");
2379-
}
23802371
mStatusBarView.collapseAllPanels(true);
23812372
}
23822373

@@ -2389,9 +2380,6 @@ void makeExpandedInvisible() {
23892380
}
23902381

23912382
// Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868)
2392-
if (DEBUG_EMPTY_KEYGUARD) {
2393-
Log.i(TAG, "Collapsing panel from makeExpandedInvisible");
2394-
}
23952383
mStatusBarView.collapseAllPanels(/*animate=*/ false);
23962384

23972385
// reset things to their proper state
@@ -2483,9 +2471,6 @@ public void setWindowState(int window, int state) {
24832471
mStatusBarWindowState = state;
24842472
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));
24852473
if (!showing) {
2486-
if (DEBUG_EMPTY_KEYGUARD) {
2487-
Log.i(TAG, "Collapsing panel from setWindowState");
2488-
}
24892474
mStatusBarView.collapseAllPanels(false);
24902475
}
24912476
}
@@ -3045,10 +3030,6 @@ public void run() {
30453030
}
30463031
});
30473032
if (dismissShade) {
3048-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
3049-
Log.i(TAG, "Collapsing panel startActivityDismissKeyguard after keyguard"
3050-
+ "dismiss");
3051-
}
30523033
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
30533034
}
30543035
return true;
@@ -3727,9 +3708,6 @@ public boolean onBackPressed() {
37273708
public boolean onSpacePressed() {
37283709
if (mScreenOn != null && mScreenOn
37293710
&& (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {
3730-
if (PhoneStatusBar.DEBUG_EMPTY_KEYGUARD) {
3731-
Log.i(TAG, "Collapsing panel from onSpacePressed");
3732-
}
37333711
animateCollapsePanels(0 /* flags */, true /* force */);
37343712
return true;
37353713
}

0 commit comments

Comments
 (0)