Merge "Temporarily hide lock screen unlock targets if opening a widget" into cm-11.0 (541a09ec) · Commits · e / os / android_frameworks_base

packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -312,6 +312,14 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri
		mGlowPadView.setDirectionDescriptionsResourceId(R.array.lockscreen_direction_descriptions);
		} else {
		mStoredTargets = storedTargets.split("\\\|");

		// Temporarily hide all targets if bouncing a widget
		if (mIsBouncing) {
		for (int i = 0; i < mStoredTargets.length; i++) {
		mStoredTargets[i] = LockscreenTargetUtils.EMPTY_TARGET;
		}
		}

		ArrayList<TargetDrawable> storedDrawables = new ArrayList<TargetDrawable>();

		final Resources res = getResources();
		@@ -453,6 +461,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri
		@Override
		public void showBouncer(int duration) {
		mIsBouncing = true;
		updateResources();
		KeyguardSecurityViewHelper.
		showBouncer(mSecurityMessageDisplay, mFadeView, mBouncerFrame, duration);
		}
		@@ -460,6 +469,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri
		@Override
		public void hideBouncer(int duration) {
		mIsBouncing = false;
		updateResources();
		KeyguardSecurityViewHelper.
		hideBouncer(mSecurityMessageDisplay, mFadeView, mBouncerFrame, duration);
		}