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

Merge "Removing logs for b/237743330" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-13 12:05:13 +00:00
committed by Android (Google) Code Review
parent 5538ee1c74 d7fee325b7
commit a1b16dfe42
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt
View File

@@ -54,35 +54,6 @@ class KeyguardLogger @Inject constructor(@KeyguardLog private val buffer: LogBuf
buffer.log(TAG, INFO, { str1 = arg.toString() }, { "$msg: $str1" }) buffer.log(TAG, INFO, { str1 = arg.toString() }, { "$msg: $str1" })
} }
// TODO: remove after b/237743330 is fixed
fun logStatusBarCalculatedAlpha(alpha: Float) {
buffer.log(TAG, DEBUG, { double1 = alpha.toDouble() }, { "Calculated new alpha: $double1" })
}
// TODO: remove after b/237743330 is fixed
fun logStatusBarExplicitAlpha(alpha: Float) {
buffer.log(
TAG,
DEBUG,
{ double1 = alpha.toDouble() },
{ "new mExplicitAlpha value: $double1" }
)
}
// TODO: remove after b/237743330 is fixed
fun logStatusBarAlphaVisibility(visibility: Int, alpha: Float, state: String) {
buffer.log(
TAG,
DEBUG,
{
int1 = visibility
double1 = alpha.toDouble()
str1 = state
},
{ "changing visibility to $int1 with alpha $double1 in state: $str1" }
)
}
@JvmOverloads @JvmOverloads
fun logBiometricMessage( fun logBiometricMessage(
@CompileTimeConstant context: String, @CompileTimeConstant context: String,

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarViewController.java
View File

@@ -475,9 +475,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
newAlpha = Math.min(getKeyguardContentsAlpha(), alphaQsExpansion) newAlpha = Math.min(getKeyguardContentsAlpha(), alphaQsExpansion)
* mKeyguardStatusBarAnimateAlpha * mKeyguardStatusBarAnimateAlpha
* (1.0f - mKeyguardHeadsUpShowingAmount); * (1.0f - mKeyguardHeadsUpShowingAmount);
if (newAlpha != mView.getAlpha() && (newAlpha == 0 || newAlpha == 1)) {
mLogger.logStatusBarCalculatedAlpha(newAlpha);
}
} }
boolean hideForBypass = boolean hideForBypass =
@@ -500,10 +497,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
if (mDisableStateTracker.isDisabled()) { if (mDisableStateTracker.isDisabled()) {
visibility = View.INVISIBLE; visibility = View.INVISIBLE;
} }
if (visibility != mView.getVisibility()) {
mLogger.logStatusBarAlphaVisibility(visibility, alpha,
StatusBarState.toString(mStatusBarState));
}
mView.setAlpha(alpha); mView.setAlpha(alpha);
mView.setVisibility(visibility); mView.setVisibility(visibility);
} }
@@ -608,10 +601,6 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat
* @param alpha a value between 0 and 1. -1 if the value is to be reset/ignored. * @param alpha a value between 0 and 1. -1 if the value is to be reset/ignored.
*/ */
public void setAlpha(float alpha) { public void setAlpha(float alpha) {
if (mExplicitAlpha != alpha && (mExplicitAlpha == -1 || alpha == -1)) {
// logged if value changed to ignored or from ignored
mLogger.logStatusBarExplicitAlpha(alpha);
}
mExplicitAlpha = alpha; mExplicitAlpha = alpha;
updateViewState(); updateViewState();
} }