Merge "Add metrics for handed bouncer" into sc-v2-dev (eb9f46f0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode;
		import com.android.systemui.Gefingerpoken;
		import com.android.systemui.R;
		import com.android.systemui.animation.Interpolators;
		import com.android.systemui.shared.system.SysUiStatsLog;
		import com.android.systemui.statusbar.notification.stack.StackStateAnimator;

		import java.util.ArrayList;
		@@ -472,6 +473,11 @@ public class KeyguardSecurityContainer extends FrameLayout {
		mIsSecurityViewLeftAligned ? Settings.Global.ONE_HANDED_KEYGUARD_SIDE_LEFT
		: Settings.Global.ONE_HANDED_KEYGUARD_SIDE_RIGHT);

		int keyguardState = mIsSecurityViewLeftAligned
		? SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SWITCH_LEFT
		: SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SWITCH_RIGHT;
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, keyguardState);

		updateSecurityViewLocation(animate);
		}
		}

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -151,9 +151,17 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		}

		public void reportUnlockAttempt(int userId, boolean success, int timeoutMs) {
		int bouncerSide = SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__SIDE__DEFAULT;
		if (canUseOneHandedBouncer()) {
		bouncerSide = isOneHandedKeyguardLeftAligned()
		? SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__SIDE__LEFT
		: SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__SIDE__RIGHT;
		}

		if (success) {
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
		SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__SUCCESS);
		SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__SUCCESS,
		bouncerSide);
		mLockPatternUtils.reportSuccessfulPasswordAttempt(userId);
		// Force a garbage collection in an attempt to erase any lockscreen password left in
		// memory. Do it asynchronously with a 5-sec delay to avoid making the keyguard
		@@ -168,7 +176,8 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		});
		} else {
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED,
		SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__FAILURE);
		SysUiStatsLog.KEYGUARD_BOUNCER_PASSWORD_ENTERED__RESULT__FAILURE,
		bouncerSide);
		reportFailedUnlockAttempt(userId, timeoutMs);
		}
		mMetricsLogger.write(new LogMaker(MetricsEvent.BOUNCER)
		@@ -314,6 +323,14 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
		@Override
		public void onResume(int reason) {
		if (mCurrentSecurityMode != SecurityMode.None) {
		int state = SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN;
		if (canUseOneHandedBouncer()) {
		state = mView.isOneHandedModeLeftAligned()
		? SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN_LEFT
		: SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN_RIGHT;
		}
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED, state);

		getCurrentSecurityController().onResume(reason);
		}
		mView.onResume(

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -252,8 +252,6 @@ public class KeyguardBouncer {
		mKeyguardViewController.resetSecurityContainer();
		showPromptReason(mBouncerPromptReason);
		}
		SysUiStatsLog.write(SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED,
		SysUiStatsLog.KEYGUARD_BOUNCER_STATE_CHANGED__STATE__SHOWN);
		}
		};